diff --git a/.gitignore b/.gitignore
index fa09fc3..50fd3f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ samba-3.6.0pre1.tar.gz
 /samba-3.6.0rc2.tar.gz
 /samba-3.6.0rc3.tar.gz
 /samba-3.6.0.tar.gz
+/samba-3.6.1.tar.gz
diff --git a/samba.spec b/samba.spec
index 757289b..b8b67d9 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,5 +1,5 @@
-%define main_release 73
-%define samba_version 3.6.0
+%define main_release 74
+%define samba_version 3.6.1
 %define tdb_version 1.2.9
 %define talloc_version 2.0.5
 #%define pre_release rc3
@@ -667,6 +667,9 @@ fi
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Wed Oct 26 2011 Andreas Schneider <asn@redhat.com> - 1:3.6.1-74
+- Update to 3.6.1
+
 * Tue Oct 04 2011 Guenther Deschner <gdeschner@redhat.com> - 1:3.6.0-73
 - Fix nmbd startup
 - resolves: #741630
diff --git a/sources b/sources
index 6a803b0..7c0ba73 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e297e0ea7923c7de8d7c1d8fd0ec0a05  samba-3.6.0.tar.gz
+5291717be0734e07dc07b6110e162e87  samba-3.6.1.tar.gz