diff --git a/glusterfs-3.3.1.tar.xz b/glusterfs-3.3.1.tar.xz
deleted file mode 100644
index 0900c00..0000000
--- a/glusterfs-3.3.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fc364b9198947eea1b9b0b7533aaeed6672a2f73e2ee4aada2004a64252d3ec9
-size 1565592
diff --git a/glusterfs-3.4.0qa2.tar.xz b/glusterfs-3.4.0qa2.tar.xz
new file mode 100644
index 0000000..5e95573
--- /dev/null
+++ b/glusterfs-3.4.0qa2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d25207e5c53ee6a79a8da10125f71d6635a9043ec9cab3b717a5453e7ffd5c9
+size 1689560
diff --git a/glusterfs-init.diff b/glusterfs-init.diff
deleted file mode 100644
index 7873cc4..0000000
--- a/glusterfs-init.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9563572894a0685bdb575398c775cbd187df3a9c Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Mon, 24 Sep 2012 06:08:36 +0200
-Subject: [PATCH] init.d: use proper dependencies in SUSE init script
-
-"/usr", the place where the binaries usually reside, requires
-$remote_fs.
-
-Signed-off-by: Jan Engelhardt <jengelh@inai.de>
----
- extras/init.d/glusterd-SuSE.in |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/extras/init.d/glusterd-SuSE.in b/extras/init.d/glusterd-SuSE.in
-index 16cf8de..2c3fc02 100755
---- a/extras/init.d/glusterd-SuSE.in
-+++ b/extras/init.d/glusterd-SuSE.in
-@@ -2,8 +2,8 @@
- #
- ### BEGIN INIT INFO
- # Provides:       glusterd
--# Required-Start: $local_fs $network
--# Required-Stop:
-+# Required-Start: $remote_fs $network
-+# Required-Stop: $remote_fs $network
- # Default-Start:  3 5
- # Default-Stop:
- # Short-Description: Gluster File System service for volume management
--- 
-1.7.10.4
-
diff --git a/glusterfs.changes b/glusterfs.changes
index 7fe02b4..f903d64 100644
--- a/glusterfs.changes
+++ b/glusterfs.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Nov  9 21:47:11 UTC 2012 - jengelh@inai.de
+
+- Update to new upstream release 3.4.0qa2
+* No changelog provided by upstream
+- Remove glusterfs-init.diff, merged upstream
+
 -------------------------------------------------------------------
 Wed Oct 31 12:19:47 UTC 2012 - jengelh@inai.de
 
diff --git a/glusterfs.spec b/glusterfs.spec
index 80c1761..33b990e 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -16,24 +16,22 @@
 #
 
 
-#git_master
-%define master 0
 Name:           glusterfs
 %define lname_api	libgfapi0
 %define lname_rpc	libgfrpc0
 %define lname_xdr	libgfxdr0
 %define lname_gf	libglusterfs0
-Version:        3.3.1
+Version:        3.4.0~qa2
 Release:        0
+%define rversion	3.4.0qa2
 Summary:        Aggregating distributed file system
 License:        GPL-2.0+ ; GPL-3.0
 Group:          System/Filesystems
 Url:            http://gluster.org/
 
 #Git-Clone:	git://github.com/gluster/glusterfs
-Source:         %name-%version.tar.xz
+Source:         %name-%rversion.tar.xz
 Patch1:         glusterfs-date.diff
-Patch2:         glusterfs-init.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  automake
 BuildRequires:  bison
@@ -67,7 +65,7 @@ Translators from GNU Hurd kernel. Much of the code in GlusterFS is in
 user space and easily manageable.
 
 %package -n %lname_api
-Summary:        GlusterFS WIP API library
+Summary:        GlusterFS API library
 Group:          System/Libraries
 
 %description -n %lname_api
@@ -115,8 +113,8 @@ This package provides development files such as headers and library
 links.
 
 %prep
-%setup -q
-%patch -P 1 -P 2 -p1
+%setup -qn %name-%rversion
+%patch -P 1 -p1
 
 %build
 ./autogen.sh;
@@ -191,6 +189,7 @@ perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el;
 %_initrddir/glusterd
 %dir %_sysconfdir/%name
 %config(noreplace) %_sysconfdir/%name/glusterd.vol
+%config(noreplace) %_sysconfdir/%name/glusterfs-logrotate
 #%config %_sysconfdir/%name/*.sample
 /sbin/mount.%name
 %_libexecdir/%name
@@ -201,11 +200,9 @@ perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el;
 %_localstatedir/lib/glusterd
 %_localstatedir/log/%name
 
-%if %master
 %files -n %lname_api
 %defattr(-,root,root)
 %_libdir/libgfapi.so.0*
-%endif
 
 %files -n %lname_rpc
 %defattr(-,root,root)
@@ -223,8 +220,6 @@ perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el;
 %defattr(-,root,root)
 %_includedir/%name
 %_libdir/*.so
-%if %master
 %_libdir/pkgconfig/*.pc
-%endif
 
 %changelog