diff --git a/arangod/Agency/GossipCallback.cpp b/arangod/Agency/GossipCallback.cpp
new file mode 100644
index 0000000000..7e93b6b21b
--- /dev/null
+++ b/arangod/Agency/GossipCallback.cpp
@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+/// DISCLAIMER
+///
+/// Copyright 2014-2016 ArangoDB GmbH, Cologne, Germany
+/// Copyright 2004-2014 triAGENS GmbH, Cologne, Germany
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+/// Copyright holder is ArangoDB GmbH, Cologne, Germany
+///
+/// @author Kaveh Vahedipour
+////////////////////////////////////////////////////////////////////////////////
+
+#include "GossipCallback.h"
+
+using namespace arangodb::consensus;
+using namespace arangodb::velocypack;
+
+GossipCallback::GossipCallback() {}
+
+bool GossipCallback::operator()(arangodb::ClusterCommResult* res) {
+  return true;
+}
diff --git a/arangod/Agency/GossipCallback.h b/arangod/Agency/GossipCallback.h
new file mode 100644
index 0000000000..8ac28027d0
--- /dev/null
+++ b/arangod/Agency/GossipCallback.h
@@ -0,0 +1,45 @@
+////////////////////////////////////////////////////////////////////////////////
+/// DISCLAIMER
+///
+/// Copyright 2014-2016 ArangoDB GmbH, Cologne, Germany
+/// Copyright 2004-2014 triAGENS GmbH, Cologne, Germany
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+/// Copyright holder is ArangoDB GmbH, Cologne, Germany
+///
+/// @author Kaveh Vahedipour
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef ARANGOD_CONSENSUS_GOSSIP_CALLBACK_H
+#define ARANGOD_CONSENSUS_GOSSIP_CALLBACK_H 1
+
+#include "Cluster/ClusterComm.h"
+
+namespace arangodb {
+namespace consensus {
+
+class GossipCallback : public arangodb::ClusterCommCallback {
+ public:
+  GossipCallback();
+
+  virtual bool operator()(arangodb::ClusterCommResult*) override final;
+
+  void shutdown();
+
+ private:
+};
+}
+}  // namespace
+
+#endif
diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt
index 6157c3d3b4..9250596a6b 100644
--- a/arangod/CMakeLists.txt
+++ b/arangod/CMakeLists.txt
@@ -83,6 +83,7 @@ add_executable(${BIN_ARANGOD}
   Agency/CleanOutServer.cpp
   Agency/FailedLeader.cpp
   Agency/FailedServer.cpp
+  Agency/GossipCallback.cpp
   Agency/MoveShard.cpp
   Agency/NotifierThread.cpp
   Agency/NotifyCallback.cpp