diff --git a/bindings/flow/local.mk b/bindings/flow/local.mk
index 95814f970e..1f2260e4c1 100644
--- a/bindings/flow/local.mk
+++ b/bindings/flow/local.mk
@@ -22,5 +22,23 @@
 
 fdb_flow_CFLAGS := -Ibindings/c $(fdbrpc_CFLAGS)
 fdb_flow_LDFLAGS := -Llib -lfdb_c $(fdbrpc_LDFLAGS)
-fdb_flow_LIBS := lib/libfdbrpc.a
+fdb_flow_LIBS :=
 
+packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz: fdb_flow
+	@echo "Packaging      fdb_flow"
+	@rm -rf packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
+	@mkdir -p packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/lib packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/bindings/flow packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/bindings/c/foundationdb
+	@cp lib/libfdb_flow.a packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/lib
+	@find bindings/flow -name '*.h' -not -name 'bindings/flow/tester/*' -exec cp {} packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/bindings/flow \;
+	@find bindings/c/foundationdb -name '*.h' -exec cp {} packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/bindings/c/foundationdb \;
+	@tar czf packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz -C packages fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
+	@rm -rf packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
+
+FDB_FLOW: packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz
+
+FDB_FLOW_clean:
+	@echo "Cleaning       fdb_flow package"
+	@rm -rf packages/fdb-flow-*.tar.gz
+
+packages: FDB_FLOW
+packages_clean: FDB_FLOW_clean
diff --git a/fdbclient/BackupAgent.h b/fdbclient/BackupAgent.h
index b5689d5fd3..7cf8c33bb0 100644
--- a/fdbclient/BackupAgent.h
+++ b/fdbclient/BackupAgent.h
@@ -25,7 +25,7 @@
 #include "flow/flow.h"
 #include "NativeAPI.h"
 #include "TaskBucket.h"
-#include "flow/Notified.h"
+#include "Notified.h"
 #include <fdbrpc/IAsyncFile.h>
 #include "KeyBackedTypes.h"
 #include <ctime>
diff --git a/flow/Notified.h b/fdbclient/Notified.h
similarity index 98%
rename from flow/Notified.h
rename to fdbclient/Notified.h
index 4496b88e11..2890b9cb41 100644
--- a/flow/Notified.h
+++ b/fdbclient/Notified.h
@@ -22,7 +22,7 @@
 #define FLOW_NOTIFIED_H
 #pragma once
 
-#include "fdbclient/FDBTypes.h"
+#include "FDBTypes.h"
 #include "flow/TDMetric.actor.h"
 
 struct NotifiedVersion {
@@ -78,4 +78,4 @@ private:
 	VersionMetricHandle val;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/fdbserver/ApplyMetadataMutation.h b/fdbserver/ApplyMetadataMutation.h
index 4506d52270..2910a810ca 100644
--- a/fdbserver/ApplyMetadataMutation.h
+++ b/fdbserver/ApplyMetadataMutation.h
@@ -25,10 +25,10 @@
 #include "fdbclient/MutationList.h"
 #include "fdbclient/SystemData.h"
 #include "fdbclient/BackupAgent.h"
+#include "fdbclient/Notified.h"
 #include "IKeyValueStore.h"
 #include "LogSystem.h"
 #include "LogProtocolMessage.h"
-#include "flow/Notified.h"
 
 static bool isMetadataMutation(MutationRef const& m) {
 	// FIXME: This is conservative - not everything in system keyspace is necessarily processed by applyMetadataMutations
diff --git a/fdbserver/KeyValueStoreMemory.actor.cpp b/fdbserver/KeyValueStoreMemory.actor.cpp
index 54ebc3ee5a..d081ee0fe4 100644
--- a/fdbserver/KeyValueStoreMemory.actor.cpp
+++ b/fdbserver/KeyValueStoreMemory.actor.cpp
@@ -22,8 +22,8 @@
 #include "IKeyValueStore.h"
 #include "IDiskQueue.h"
 #include "flow/IndexedSet.h"
-#include "flow/Notified.h"
 #include "flow/ActorCollection.h"
+#include "fdbclient/Notified.h"
 #include "fdbclient/SystemData.h"
 
 #define OP_DISK_OVERHEAD (sizeof(OpHeader) + 1)
@@ -705,4 +705,4 @@ IKeyValueStore* keyValueStoreMemory( std::string const& basename, UID logID, int
 
 IKeyValueStore* keyValueStoreLogSystem( class IDiskQueue* queue, UID logID, int64_t memoryLimit, bool disableSnapshot ) {
 	return new KeyValueStoreMemory( queue, logID, memoryLimit, disableSnapshot );
-}
\ No newline at end of file
+}
diff --git a/fdbserver/MasterProxyServer.actor.cpp b/fdbserver/MasterProxyServer.actor.cpp
index de7fd4d89d..a45c53e982 100644
--- a/fdbserver/MasterProxyServer.actor.cpp
+++ b/fdbserver/MasterProxyServer.actor.cpp
@@ -31,9 +31,9 @@
 #include "LogSystemDiskQueueAdapter.h"
 #include "IKeyValueStore.h"
 #include "fdbclient/SystemData.h"
-#include "flow/Notified.h"
 #include "fdbrpc/sim_validation.h"
 #include "fdbrpc/batcher.actor.h"
+#include "fdbclient/Notified.h"
 #include "fdbclient/KeyRangeMap.h"
 #include "ConflictSet.h"
 #include "flow/Stats.h"
diff --git a/fdbserver/OldTLogServer.actor.cpp b/fdbserver/OldTLogServer.actor.cpp
index c8903a4b36..50634d838c 100644
--- a/fdbserver/OldTLogServer.actor.cpp
+++ b/fdbserver/OldTLogServer.actor.cpp
@@ -23,11 +23,11 @@
 #include "flow/Stats.h"
 #include "flow/UnitTest.h"
 #include "fdbclient/NativeAPI.h"
+#include "fdbclient/Notified.h"
 #include "fdbclient/KeyRangeMap.h"
 #include "fdbclient/SystemData.h"
 #include "WorkerInterface.h"
 #include "TLogInterface.h"
-#include "flow/Notified.h"
 #include "Knobs.h"
 #include "IKeyValueStore.h"
 #include "flow/ActorCollection.h"
@@ -1448,4 +1448,4 @@ namespace oldTLog {
 		Void _ = wait( tLogStart( &self, LogSystemConfig(), Version(0), Version(0), std::vector<Tag>(), true, tli, ReplyPromise<TLogInterface>(), recoveryCount ) || removed );
 		throw internal_error();  // tLogStart doesn't return without an error
 	}
-}
\ No newline at end of file
+}
diff --git a/fdbserver/Orderer.actor.h b/fdbserver/Orderer.actor.h
index bcd5ee5cf2..0d1d1048b5 100644
--- a/fdbserver/Orderer.actor.h
+++ b/fdbserver/Orderer.actor.h
@@ -27,8 +27,8 @@
 #elif !defined(FDBSERVER_ORDERER_ACTOR_H)
 	#define FDBSERVER_ORDERER_ACTOR_H
 
+#include "fdbclient/Notified.h"
 #include "flow/actorcompiler.h"
-#include "flow/Notified.h"
 
 template <class Seq>
 class Orderer {
@@ -71,4 +71,4 @@ private:
 	Promise<Void> shutdown;  // Never set, only broken on destruction
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index a3177ac46c..8727e8648e 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -23,11 +23,11 @@
 #include "flow/Stats.h"
 #include "flow/UnitTest.h"
 #include "fdbclient/NativeAPI.h"
+#include "fdbclient/Notified.h"
 #include "fdbclient/KeyRangeMap.h"
 #include "fdbclient/SystemData.h"
 #include "WorkerInterface.h"
 #include "TLogInterface.h"
-#include "flow/Notified.h"
 #include "Knobs.h"
 #include "IKeyValueStore.h"
 #include "flow/ActorCollection.h"
diff --git a/fdbserver/masterserver.actor.cpp b/fdbserver/masterserver.actor.cpp
index ab7558a2da..7231518ff3 100644
--- a/fdbserver/masterserver.actor.cpp
+++ b/fdbserver/masterserver.actor.cpp
@@ -24,9 +24,9 @@
 #include "flow/Trace.h"
 #include "fdbrpc/FailureMonitor.h"
 #include "fdbclient/NativeAPI.h"
+#include "fdbclient/Notified.h"
 #include "fdbclient/SystemData.h"
 #include "ConflictSet.h"
-#include "flow/Notified.h"
 #include "DataDistribution.h"
 #include "Knobs.h"
 #include <iterator>
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index b0407bf45b..0fa7a70391 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -29,12 +29,12 @@
 #include "fdbclient/KeyRangeMap.h"
 #include "fdbclient/SystemData.h"
 #include "fdbclient/NativeAPI.h"
+#include "fdbclient/Notified.h"
 #include "fdbclient/MasterProxyInterface.h"
 #include "fdbclient/DatabaseContext.h"
 #include "WorkerInterface.h"
 #include "TLogInterface.h"
 #include "MoveKeys.h"
-#include "flow/Notified.h"
 #include "Knobs.h"
 #include "WaitFailure.h"
 #include "IKeyValueStore.h"
diff --git a/flow/local.mk b/flow/local.mk
index defc7af0b0..8701ff9e45 100644
--- a/flow/local.mk
+++ b/flow/local.mk
@@ -37,3 +37,27 @@ flow/hgVersion.h: FORCE
 
 lib/libflow.a: bin/coverage.flow.xml
 
+ifeq ($(RELEASE),true)
+  FLOWVER = $(VERSION)
+else
+  FLOWVER = $(VERSION)-PRERELEASE
+endif
+
+packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz: flow
+	@echo "Packaging      flow"
+	@rm -rf packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
+	@mkdir -p packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/bin packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/lib packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/flow
+	@cp lib/libflow.a packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/lib
+	@cp bin/actorcompiler.exe packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/bin
+	@find flow -name '*.h' -exec cp {} packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/flow \;
+	@tar czf packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz -C packages flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
+	@rm -rf packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
+
+FLOW: packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz
+
+FLOW_clean:
+	@echo "Cleaning       flow"
+	@rm -rf packages/flow-*.tar.gz
+
+packages: FLOW
+packages_clean: FLOW_clean