diff --git a/.cvsignore b/.cvsignore
index 62cab0f..8483b03 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-samba-3.3.3.tar.gz
+samba-3.3.4.tar.gz
diff --git a/pam_winbind.conf b/pam_winbind.conf
index be0767b..dd0b112 100644
--- a/pam_winbind.conf
+++ b/pam_winbind.conf
@@ -7,20 +7,32 @@
 [global]
 
 # turn on debugging
-;debug = yes
+;debug = no
+
+# turn on extended PAM state debugging
+;debug_state = no
 
 # request a cached login if possible
 # (needs "winbind offline logon = yes" in smb.conf)
-;cached_login = yes
+;cached_login = no
 
 # authenticate using kerberos
-;krb5_auth = yes
+;krb5_auth = no
 
 # when using kerberos, request a "FILE" krb5 credential cache type
 # (leave empty to just do krb5 authentication but not have a ticket
 # afterwards)
-;krb5_ccache_type = FILE
+;krb5_ccache_type =
 
 # make successful authentication dependend on membership of one SID
 # (can also take a name)
 ;require_membership_of =
+
+# password expiry warning period in days
+;warn_pwd_expire = 14
+
+# omit pam conversations
+;silent = no
+
+# create homedirectory on the fly
+;mkhomedir = no
diff --git a/samba.spec b/samba.spec
index cf5ea7e..9134726 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,5 +1,5 @@
-%define main_release 35
-%define samba_version 3.3.3
+%define main_release 36
+%define samba_version 3.3.4
 %define tdb_version 1.1.2
 %define talloc_version 1.2.0
 %define pre_release %nil
@@ -879,6 +879,9 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Wed Apr 29 2009 Guenther Deschner <gdeschner@redhat.com> - 3.3.4-0.36
+- Update to 3.3.4
+
 * Mon Apr 20 2009 Guenther Deschner <gdeschner@redhat.com> - 3.3.3-0.35
 - Enable build of idmap_tdb2 for clustered setups
 
diff --git a/sources b/sources
index 48a1985..63e6ea0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4d5835817416d1ffa30783af45c5a9ed  samba-3.3.3.tar.gz
+1443165edb7cb3f56f1e77aec1ee3266  samba-3.3.4.tar.gz