diff --git a/nbd-2.9.25-have_falloc_ph.diff b/nbd-2.9.25-have_falloc_ph.diff
deleted file mode 100644
index 8164a59..0000000
--- a/nbd-2.9.25-have_falloc_ph.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- nbd-2.9.25/nbd-server.c.orig	2012-01-06 17:15:20.229280050 -0500
-+++ nbd-2.9.25/nbd-server.c	2012-01-06 17:47:08.447424041 -0500
-@@ -83,7 +83,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <fcntl.h>
--#ifdef HAVE_FALLOC_PH
-+#if HAVE_FALLOC_PH
- #include <linux/falloc.h>
- #endif
- #include <arpa/inet.h>
-@@ -1461,7 +1461,7 @@
-  * file to resparsify stuff that isn't needed anymore (see NBD_CMD_TRIM)
-  */
- int exptrim(struct nbd_request* req, CLIENT* client) {
--#ifdef HAVE_FALLOC_PH
-+#if HAVE_FALLOC_PH
- 	FILE_INFO prev = g_array_index(client->export, FILE_INFO, 0);
- 	FILE_INFO cur = prev;
- 	int i = 1;
diff --git a/nbd-2.9.25.tar.bz2 b/nbd-2.9.25.tar.bz2
deleted file mode 100644
index bd2e8d3..0000000
--- a/nbd-2.9.25.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:179548406aa2bcb0c6bff3aa0484dbb04136ec055aa385c84fefbe3c9ea96ba4
-size 500483
diff --git a/nbd-3.0.tar.bz2 b/nbd-3.0.tar.bz2
new file mode 100644
index 0000000..7c989f8
--- /dev/null
+++ b/nbd-3.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f7210edfa858f5ae69bdbf76f5467ac9dcaa97074d945e55e2a683e7aa228b93
+size 505274
diff --git a/nbd.changes b/nbd.changes
index 05def2e..061e0f3 100644
--- a/nbd.changes
+++ b/nbd.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Feb 29 15:51:37 UTC 2012 - tabraham@novell.com
+
+-  Update to nbd-3.0
+   * minor bug fixes
+
+- removed obsolete nbd-2.9.25-have_falloc_ph.diff
+- compile with -fno-strict-aliasing to prevent breakage with new gcc
+
 -------------------------------------------------------------------
 Thu Jan  5 20:31:57 UTC 2012 - tabraham@novell.com
 
diff --git a/nbd.spec b/nbd.spec
index 00212e2..9b6fc5a 100644
--- a/nbd.spec
+++ b/nbd.spec
@@ -21,7 +21,7 @@
 Name:           nbd
 BuildRequires:  doxygen glib2-devel >= 2.26.0
 PreReq:         %insserv_prereq coreutils
-Version:        2.9.25
+Version:        3.0
 Release:        1
 License:        GPL-2.0+
 Group:          Productivity/Networking/Other
@@ -30,7 +30,6 @@ Source:         %{name}-%{version}.tar.bz2
 Source2:        init.nbd-server
 Patch2:         nbd-2.9.25-close.diff
 Patch3:         nbd-2.9.25-doxyfile.diff
-Patch4:         nbd-2.9.25-have_falloc_ph.diff
 Summary:        Network Block Device Server and Client Utilities
 Url:            http://nbd.sourceforge.net/
 Prefix:         /usr
@@ -98,10 +97,9 @@ Authors:
 %setup
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -fstack-protector"
+export CFLAGS="$RPM_OPT_FLAGS -fstack-protector -fno-strict-aliasing"
 ./configure --with-gnu-ld --prefix=/usr --mandir=%{_mandir} \
 	--infodir=%{_infodir} --libdir=%{_libdir} --libexecdir=%{_libdir} \
 	--program-prefix="" --sysconfdir=/etc --build=%{_target_cpu}-suse-linux