diff --git a/glusterfs-3.5.2.tar.gz b/glusterfs-3.5.2.tar.gz
deleted file mode 100644
index 9ee9af0..0000000
--- a/glusterfs-3.5.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef58b467a60fd6bd0685d4167a45f0860895414285b3908167b264aa63d276c3
-size 4972250
diff --git a/glusterfs-3.6.1.tar.gz b/glusterfs-3.6.1.tar.gz
new file mode 100644
index 0000000..751cb25
--- /dev/null
+++ b/glusterfs-3.6.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d0b28fb142032f4d2ffdfc56a9f5f456ced5dcca1970f8051d86bc35688126dc
+size 5927904
diff --git a/glusterfs.changes b/glusterfs.changes
index b05d564..ae8d6b3 100644
--- a/glusterfs.changes
+++ b/glusterfs.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Thu Jan 15 15:03:38 UTC 2015 - p.drouand@gmail.com
+
+- Update to version 3.6.1
+  * api: versioned symbols in libgfapi.so for compatibility
+  * Use versioned symbols to keep libgfapi at libgfapi.so.0.0.0
+  * Some nits uncovered:
+   - there are a couple functions declared that do not have an
+     associated definition, e.g. glfs_truncate(), glfs_caller_specific_init() 
+   - there are seven private/internal functions used by heal/src/glfsheal
+     and the gfapi master xlator (glfs-master.c): glfs_loc_touchup(),
+     glfs_active_subvol(), and glfs_subvol_done(), glfs_init_done(),
+     glfs_resolve_at(), glfs_free_from_ctx(), and glfs_new_from_ctx();
+     which are not declared in glfs.h;
+   - for this initial pass at versioned symbols, we use the earliest version
+     of all public symbols, i.e. those for which there are declarations in
+     glfs.h or glfs-handles.h.
+     Further investigation as we do backports to 3.6, 3.4, and 3.4
+     will be required to determine if older implementations need to
+     be preserved (forward ported) and their associated alias(es) and
+     symbol version(s) defined.
+
 -------------------------------------------------------------------
 Mon Aug  4 21:27:22 UTC 2014 - scorot@free.fr
 
diff --git a/glusterfs.spec b/glusterfs.spec
index e1c4777..a2f03bb 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -17,9 +17,8 @@
 
 
 Name:           glusterfs
-Version:        3.5.2
+Version:        3.6.1
 Release:        0
-%define rversion	3.5.2
 Summary:        Aggregating distributed file system
 License:        GPL-2.0 or LGPL-3.0+
 Group:          System/Filesystems
@@ -27,7 +26,7 @@ Url:            http://gluster.org/
 
 #Git-Clone:	git://github.com/gluster/glusterfs
 #Git-Clone:	git://github.com/fvzwieten/lsgvt
-Source:         http://download.gluster.org/pub/gluster/glusterfs/3.5/%version/%name-%version.tar.gz
+Source:         http://download.gluster.org/pub/gluster/glusterfs/3.6/%version/%name-%version.tar.gz
 Patch1:         glusterfs-date.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
@@ -54,7 +53,7 @@ BuildRequires:  pkgconfig(uuid)
 %if 0%{?suse_version} >= 1210
 BuildRequires:  systemd
 %endif
-Requires:       python
+#Requires:       python
 
 %description
 GlusterFS is a clustered file-system capable of scaling to several
@@ -238,14 +237,14 @@ chmod u-s "$b/%_bindir/fusermount-glusterfs"
 %_libexecdir/%name/
 %_libdir/%name/
 %_sbindir/gluster*
-%_sbindir/glfsheal
+#%_sbindir/glfsheal
 %_sbindir/rcglusterd
 %_datadir/glusterfs/
 %_mandir/man*/*
 %_docdir/%name
 %_localstatedir/lib/glusterd
 %_localstatedir/log/%name
-%python_sitelib/gluster*
+#%python_sitelib/gluster*
 %if 0%{?_unitdir:1}
 %_unitdir/glusterd.service
 %else