diff --git a/CHANGELOG b/CHANGELOG
index 2b54dbb9d8..cce43679e5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -25,6 +25,8 @@ git-annex (7.20190130) UNRELEASED; urgency=medium
     urls get truncated on those. Fail in a better way in this case,
     and avoid failing when removing such files from the export, so
     after the user has renamed the problem files the export will succeed.
+  * Added NetworkBSD build flag to deal with Network.BSD moving to a new
+    package.
 
  -- Joey Hess <id@joeyh.name>  Wed, 30 Jan 2019 12:30:22 -0400
 
diff --git a/git-annex.cabal b/git-annex.cabal
index 9b7eb95161..324ba86a80 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -284,6 +284,10 @@ Flag DebugLocks
 Flag Dbus
   Description: Enable dbus support
 
+Flag NetworkBSD
+  Description: Build with network-3.0 which split out network-bsd
+  Default: True
+
 source-repository head
   type: git
   location: git://git-annex.branchable.com/
@@ -297,7 +301,6 @@ Executable git-annex
   Main-Is: git-annex.hs
   Build-Depends:
    base (>= 4.9 && < 5.0),
-   network (>= 2.6.3.0),
    network-uri (>= 2.6),
    optparse-applicative (>= 0.11.0),
    containers (>= 0.5.7.1),
@@ -392,6 +395,11 @@ Executable git-annex
   else
     Build-Depends: unix (>= 2.7.2)
 
+  if flag(NetworkBSD)
+    Build-Depends: network-bsd, network (>= 3.0.0.0)
+  else
+    Build-Depends: network (< 3.0.0.0), network (>= 2.6.3.0)
+
   if flag(S3)
     Build-Depends: aws (>= 0.9.2)
     CPP-Options: -DWITH_S3
diff --git a/stack-lts-9.9.yaml b/stack-lts-9.9.yaml
index aa82abf8db..d1c6bfe047 100644
--- a/stack-lts-9.9.yaml
+++ b/stack-lts-9.9.yaml
@@ -11,6 +11,7 @@ flags:
     dbus: false
     debuglocks: false
     benchmark: false
+    networkbsd: false
 packages:
 - '.'
 extra-deps:
diff --git a/stack-windows.yaml b/stack-windows.yaml
index f843bb8665..672744320b 100644
--- a/stack-windows.yaml
+++ b/stack-windows.yaml
@@ -11,6 +11,7 @@ flags:
     dbus: false
     debuglocks: false
     benchmark: false
+    networkbsd: false
 packages:
 - '.'
 extra-deps:
diff --git a/stack.yaml b/stack.yaml
index f827b376ca..2a38147d9d 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -11,6 +11,7 @@ flags:
     dbus: false
     debuglocks: false
     benchmark: false
+    networkbsd: false
 packages:
 - '.'
 extra-deps: