diff --git a/0001-Remove-backward-compatibility-option-for-newer-cmake.patch b/0001-Remove-backward-compatibility-option-for-newer-cmake.patch
new file mode 100644
index 0000000..315ad6a
--- /dev/null
+++ b/0001-Remove-backward-compatibility-option-for-newer-cmake.patch
@@ -0,0 +1,25 @@
+From 21dfcf6343cec2feb0e4ebd8b9e22a3aa39e5d9d Mon Sep 17 00:00:00 2001
+From: Jim McDonough <jmcd@samba.org>
+Date: Mon, 10 Mar 2014 10:16:28 -0400
+Subject: [PATCH 1/2] Remove backward compatibility option for newer cmake
+ builds to work.
+
+---
+ src/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 6732a3f..40225e4 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -41,7 +41,6 @@ include_directories(
+   ${PAM_CSYNC_PRIVATE_INCLUDE_DIRS}
+ )
+ 
+-set(CMAKE_BACKWARDS_COMPATIBILITY "2.2")
+ macro_add_plugin(${PAM_CSYNC_LIBRARY} ${pam_SRCS})
+ 
+ target_link_libraries(${PAM_CSYNC_LINK_LIBRARIES})
+-- 
+1.8.4.5
+
diff --git a/0002-Update-FSF-address.patch b/0002-Update-FSF-address.patch
new file mode 100644
index 0000000..abf4967
--- /dev/null
+++ b/0002-Update-FSF-address.patch
@@ -0,0 +1,25 @@
+From 5d42880c167cf2925dd3c15d1ba1295ef432fb19 Mon Sep 17 00:00:00 2001
+From: Jim McDonough <jmcd@samba.org>
+Date: Mon, 10 Mar 2014 10:16:57 -0400
+Subject: [PATCH 2/2] Update FSF address
+
+---
+ COPYING | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/COPYING b/COPYING
+index 9ed3415..e095850 100644
+--- a/COPYING
++++ b/COPYING
+@@ -2,7 +2,7 @@
+                        Version 2, June 1991
+ 
+  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+-                          675 Mass Ave, Cambridge, MA 02139, USA
++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  Everyone is permitted to copy and distribute verbatim copies
+  of this license document, but changing it is not allowed.
+ 
+-- 
+1.8.4.5
+
diff --git a/pam_csync.changes b/pam_csync.changes
index 903d7a7..7f17d9f 100644
--- a/pam_csync.changes
+++ b/pam_csync.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Mar 10 14:44:34 UTC 2014 - jmcdonough@suse.com
+
+- Remove cmake backward compatibility flag and update FSF
+  address in license
+  + Added 0001-Remove-backward-compatibility-option-for-newer-cmake.patch
+  + Added 0002-Update-FSF-address.patch
+
 -------------------------------------------------------------------
 Mon Feb  1 12:15:41 UTC 2010 - jengelh@medozas.de
 
diff --git a/pam_csync.spec b/pam_csync.spec
index fb5c076..cb69be2 100644
--- a/pam_csync.spec
+++ b/pam_csync.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package pam_csync (Version 0.42.0)
+# spec file for package pam_csync
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,19 +15,24 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           pam_csync
-BuildRequires:  cmake libcsync-devel libiniparser-devel pam-devel
+BuildRequires:  cmake
+BuildRequires:  libcsync-devel
+BuildRequires:  libiniparser-devel
+BuildRequires:  pam-devel
+Version:        0.42.0
+Release:        0
+Summary:        A PAM module for roaming home directories
 License:        GPL-2.0+
 Group:          System/Libraries
-Version:        0.42.0
-Release:        1
-Summary:        A PAM module for roaming home directories
 Url:            http://www.csync.org/
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        baselibs.conf
+# PATCH-FIX-UPSTREAM 0001-Remove-backward-compatibility-option-for-newer-cmake.patch
+Patch1:         0001-Remove-backward-compatibility-option-for-newer-cmake.patch
+# PATCH-FIX-UPSTREAM 0002-Update-FSF-address.patch
+Patch2:         0002-Update-FSF-address.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -45,6 +50,8 @@ Authors:
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
 
 %build
 if test ! -d "build"; then