diff --git a/openvpn-2.1.4.tar.gz b/openvpn-2.1.4.tar.gz
deleted file mode 100644
index ccbdd88..0000000
--- a/openvpn-2.1.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:67fe78e5def82d44d2ad4ef6fc6d87901195849d10b6b3cab81fa03257f52af5
-size 863726
diff --git a/openvpn-2.1.4.tar.gz.asc b/openvpn-2.1.4.tar.gz.asc
deleted file mode 100644
index 85c498a..0000000
--- a/openvpn-2.1.4.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQBM2GqoHQtJlh+/UfMRApCpAJ9Dn5q4PHK8fE4ppycXJrFF21ZElgCeMPFZ
-n+jA1Kd8kEp7KOycdGKdEEc=
-=XjqX
------END PGP SIGNATURE-----
diff --git a/openvpn-2.2.1.tar.gz b/openvpn-2.2.1.tar.gz
new file mode 100644
index 0000000..77d5f62
--- /dev/null
+++ b/openvpn-2.2.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a860858cc92d4573399bb2ff17ac62d9b4b8939e6af0b8cc69150ba39d6e94e0
+size 911472
diff --git a/openvpn-2.2.1.tar.gz.asc b/openvpn-2.2.1.tar.gz.asc
new file mode 100644
index 0000000..fde6117
--- /dev/null
+++ b/openvpn-2.2.1.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQBOEro/HQtJlh+/UfMRAnXzAKCotWyBwKGp9kbuANB7ZwwIxq00WQCglkw3
+ES5WCUhTTGrEpKRknOPoGc4=
+=AX2N
+-----END PGP SIGNATURE-----
diff --git a/openvpn.changes b/openvpn.changes
index 560304b..30fcd01 100644
--- a/openvpn.changes
+++ b/openvpn.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Jul 11 14:38:45 UTC 2011 - mt@suse.de
+
+- Updated to openvpn-2.2.1, a new version series providing several
+  new features. This version fixes build issues and provides
+  updated easy-rsa for OpenSSL 1.0.0 (fixes Trac ticket #125),
+- Adopted spec file, enabled saving password in a file and to
+  specify an alternative username in x509 cert.
+- Removed X-Interactive from init script again, as systemd isn't
+  able to use it correctly [any more?] (bnc#675406). We will
+  address it later and probably use /bin/systemd-ask-password.
+
 -------------------------------------------------------------------
 Tue Mar 15 21:05:23 UTC 2011 - crrodriguez@opensuse.org
 
diff --git a/openvpn.init b/openvpn.init
index 5b4f14e..a9c3774 100644
--- a/openvpn.init
+++ b/openvpn.init
@@ -20,7 +20,6 @@
 # Should-Stop:			$syslog $time $named network-remotefs
 # Default-Start:		3 5
 # Default-Stop:			0 1 2 6
-# X-Interactive:                true
 # Short-Description:		OpenVPN tunnel
 # Description:			Start OpenVPN tunnel
 ### END INIT INFO
diff --git a/openvpn.spec b/openvpn.spec
index e1832df..2ab2a7d 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -17,8 +17,6 @@
 
 # norootforbuild
 
-%define         upstream_version 2.1.4
-
 Name:           openvpn
 Url:            http://openvpn.net/
 License:        GPLv2+ ; LGPLv2.1+
@@ -27,8 +25,9 @@ AutoReqProv:    on
 %if 0%{?suse_version}
 PreReq:         %insserv_prereq %fillup_prereq
 %endif
-Version:        2.1.4
+Version:        2.2.1
 Release:        14
+%define         upstream_version %version
 Summary:        Full-featured SSL VPN solution using a TUN/TAP Interface
 Source:         http://openvpn.net/release/openvpn-%{upstream_version}.tar.gz
 Source1:        http://openvpn.net/signatures/openvpn-%{upstream_version}.tar.gz.asc
@@ -142,7 +141,9 @@ autoreconf -fi
 export CFLAGS="$RPM_OPT_FLAGS -W -Wall -fno-strict-aliasing"
 export LDFLAGS
 %configure \
-	--enable-pthread --enable-iproute2  \
+	--enable-iproute2                   \
+	--enable-x509-alt-username          \
+	--enable-password-save              \
 	--with-lzo-headers=%_includedir/lzo \
 	CFLAGS="$CFLAGS -fPIE $PLUGIN_DEFS" \
 	LDFLAGS="$LDFLAGS -pie -lpam -rdynamic -Wl,-rpath,%{_libdir}/%{name}/plugin/lib"
@@ -185,6 +186,9 @@ for pi in auth-pam down-root; do
 	install -m 755 plugin/$pi/openvpn-$pi.so \
 		$RPM_BUILD_ROOT%{plugin_libdir}/
 done
+# we install docs via spec into %{_defaultdocdir}/name/management-notes.txt
+rm $RPM_BUILD_ROOT%{_datadir}/doc/%name/management-notes.txt
+rmdir $RPM_BUILD_ROOT%{_datadir}/doc/%name
 
 %clean
 if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
@@ -207,6 +211,7 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
 %doc sample-keys
 %doc sample-scripts
 %doc suse
+%doc management/management-notes.txt
 %doc %{_mandir}/man8/openvpn.8.gz
 %config(noreplace) %{_sysconfdir}/openvpn/
 %config %{_sysconfdir}/init.d/openvpn