diff -Nru firebird3.0-3.0.4.33055.ds4/debian/changelog firebird3.0-3.0.4.33055.ds4/debian/changelog
--- firebird3.0-3.0.4.33055.ds4/debian/changelog	2018-10-06 21:32:02.000000000 +0200
+++ firebird3.0-3.0.4.33055.ds4/debian/changelog	2018-10-07 01:38:41.000000000 +0200
@@ -1,3 +1,9 @@
+firebird3.0 (3.0.4.33055.ds4-2~~exp.0.kfbsd+jrtc27.1) UNRELEASED; urgency=medium
+
+  * TODO
+
+ -- James Clarke <jrtc27@debian.org>  Sun, 07 Oct 2018 01:38:41 +0200
+
 firebird3.0 (3.0.4.33055.ds4-2~~exp.0.kfbsd) unstable; urgency=medium
 
   * c++-std.patch: apply also to prefix.freebsd{,-amd64}
diff -Nru firebird3.0-3.0.4.33055.ds4/debian/patches/deb/march-i486.patch firebird3.0-3.0.4.33055.ds4/debian/patches/deb/march-i486.patch
--- firebird3.0-3.0.4.33055.ds4/debian/patches/deb/march-i486.patch	2018-10-05 21:52:21.000000000 +0200
+++ firebird3.0-3.0.4.33055.ds4/debian/patches/deb/march-i486.patch	2018-10-07 01:38:41.000000000 +0200
@@ -24,14 +24,3 @@
  WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-narrowing
  
  PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
---- a/builds/posix/prefix.freebsd_amd64
-+++ b/builds/posix/prefix.freebsd_amd64
-@@ -20,7 +20,7 @@
- 
- COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DFREEBSD -DAMD64 -pipe -MMD -fPIC -fmessage-length=0 -fno-delete-null-pointer-checks
- CXXFLAGS+=-std=gnu++03
--OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer
-+OPTIMIZE_FLAGS=-O3 -march=i486 -mtune=i686 -fno-omit-frame-pointer
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-narrowing
- 
- PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
diff -Nru firebird3.0-3.0.4.33055.ds4/debian/patches/out/kfreebsd-AF_INET6.patch firebird3.0-3.0.4.33055.ds4/debian/patches/out/kfreebsd-AF_INET6.patch
--- firebird3.0-3.0.4.33055.ds4/debian/patches/out/kfreebsd-AF_INET6.patch	1970-01-01 01:00:00.000000000 +0100
+++ firebird3.0-3.0.4.33055.ds4/debian/patches/out/kfreebsd-AF_INET6.patch	2018-10-07 01:38:41.000000000 +0200
@@ -0,0 +1,24 @@
+Description: Teach SockAddr.h about FreeBSD's AF_INET6 value
+--- firebird3.0-3.0.4.33055.ds4.orig/src/remote/SockAddr.h
++++ firebird3.0-3.0.4.33055.ds4/src/remote/SockAddr.h
+@@ -90,10 +90,12 @@ public:
+ 
+ #define AF_INET6_POSIX		10
+ #define AF_INET6_WINDOWS	23
++#define AF_INET6_FREEBSD	28
+ #define AF_INET6_DARWIN		30
+ 
+ #if AF_INET6 == AF_INET6_POSIX
+ #elif AF_INET6 == AF_INET6_WINDOWS
++#elif AF_INET6 == AF_INET6_FREEBSD
+ #elif AF_INET6 == AF_INET6_DARWIN
+ #else
+ #error Unknown value of AF_INET6 !
+@@ -109,6 +111,7 @@ inline void SockAddr::checkAndFixFamily(
+ 
+ 	case AF_INET6_POSIX:
+ 	case AF_INET6_WINDOWS:
++	case AF_INET6_FREEBSD:
+ 	case AF_INET6_DARWIN:
+ 		data.sock.sa_family = AF_INET6;
+ 		fb_assert(len == sizeof(sockaddr_in6));
diff -Nru firebird3.0-3.0.4.33055.ds4/debian/patches/out/kfreebsd-sse4.patch firebird3.0-3.0.4.33055.ds4/debian/patches/out/kfreebsd-sse4.patch
--- firebird3.0-3.0.4.33055.ds4/debian/patches/out/kfreebsd-sse4.patch	2018-10-05 22:09:16.000000000 +0200
+++ firebird3.0-3.0.4.33055.ds4/debian/patches/out/kfreebsd-sse4.patch	2018-10-07 01:38:41.000000000 +0200
@@ -29,14 +29,14 @@
 -EXE_LINK_OPTIONS+=-Wl,-rpath,../gen/firebird/lib
 +COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DFREEBSD -DAMD64 -pipe -MMD -fPIC -fmessage-length=0 -fno-delete-null-pointer-checks
 +CXXFLAGS+=-std=gnu++03
-+OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer
-+WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-narrowing
++OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer
++WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-invalid-offsetof -Wno-narrowing -Wno-unused-local-typedefs
  
 -PROD_FLAGS=-O -fno-builtin -DFREEBSD -DAMD64 -pipe -MMD -fPIC -std=gnu++03
 -DEV_FLAGS=-ggdb -DFREEBSD -DAMD64 -pipe -MMD -p -fPIC -Wall -Wno-non-virtual-dtor -std=gnu++03
 +PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+#DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
-+DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
++#DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS) -fmax-errors=8
++DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS) -fmax-errors=8
 +
 +# This file must be compiled with SSE4.2 support
 +%/CRC32C.o: COMMON_FLAGS += -msse4
diff -Nru firebird3.0-3.0.4.33055.ds4/debian/patches/series firebird3.0-3.0.4.33055.ds4/debian/patches/series
--- firebird3.0-3.0.4.33055.ds4/debian/patches/series	2018-10-05 21:41:22.000000000 +0200
+++ firebird3.0-3.0.4.33055.ds4/debian/patches/series	2018-10-07 01:38:41.000000000 +0200
@@ -17,3 +17,4 @@
 deb/gen-ids.patch
 deb/cve-2017-11509.patch
 out/hppa-mod_loader.patch
+out/kfreebsd-AF_INET6.patch