diff --git a/kmod-6.tar.sign b/kmod-6.tar.sign
deleted file mode 100644
index 966a02a..0000000
--- a/kmod-6.tar.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-iQIcBAABAgAGBQJPUXWSAAoJEJuipaYwy+pTos4P/3CKQ0SL5Srbcz08MhUOyFYc
-R66fuNabGaewCF/Y+bF0EoPfmxlD3mxuzyz7zuK/whGzXY0Hzyw8dKMRAXum/cfT
-c0ydn0g5yGa/haneLQAn7r01Uek3CKPhe7CM+GP+7pX8LeL30I83lH2KO7ah8qIn
-/nxQ4TRxrqxep/reaBB/mJRByApHEXEV8ZcM1dx8EQZgF/xzcujg5ftlXTe75l6d
-dn8gRHOwvNyE2Aq6tfG0K6O/0uDXVcUYMiImPFc8wtxRYMvTu9hC7+Ch9rsdWu4/
-i9HdOP/CD6C9qq7sXb75PNcwEdl6F//1YqPD3HXNfvxfbDZKigz/FqEryxjGWjff
-FG669vjNueu1G1N1I/+kitQEIVjJR6K+jbqShUlS/UcxlAZ68FwvRZ6+7K3H2fPf
-0HlaxdnnkCxrAiXsw9Pu1i1wNK1tqOvi1alURBOHqfcvHiqD8a1tM3zzoOlzOC/1
-qq2truxkntKeYa9rARwRIZkf3PrRzB38nSYQvfKBRjBmDQSJlIrxn7GIOOS5l8wq
-XIAU8jlj3iIpUkZC9ZZc0LIxgrZVYOwYAUbDvaD92VOIlYDfcpSaTmt2CDS8Iy4a
-JH4FCbXGVlpm4/cyqokcpek+R7FVQ+omqd1KL9gjmPscU6OLimGucbtwuH5PsYCo
-l04ZnsdH/0CwcCGXMj8n
-=E+w9
------END PGP SIGNATURE-----
diff --git a/kmod-6.tar.xz b/kmod-6.tar.xz
deleted file mode 100644
index 3c9fff5..0000000
--- a/kmod-6.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6f1142519916d2dbe780693045a1b2d52d0b2212ec1bd23dd5a03134c3ba62b7
-size 999660
diff --git a/kmod-7.tar.sign b/kmod-7.tar.sign
new file mode 100644
index 0000000..0dc86d5
--- /dev/null
+++ b/kmod-7.tar.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQIcBAABAgAGBQJPZxeUAAoJEJuipaYwy+pTZ5IP/2r8uXJPWWf9QpETWiTxLqjS
+wLC4d2cZuPeSLtex2TnTOFzqFJKpU7CsIXmRhqX7yScnOBm2P2bj3P3FKHF8iLAV
+wj5tNGxP7ZHNrIHmOFMuiRxSzMUxFx0MzlwLp2j5ebVs3QbV2FgbnPR8WmDwsDr7
+kSPg+yiqb3e9KsIwf8saZxveTwaKzI20rxSW2gwwLYd/Qj2YGyCPNoRuYQqrHpEp
+gbGBTdvqCadXDuJCe2w0nuMyY+b8H0ipJWXa18h0CzWPAVCA/Y6RbsJUm4RE9pPA
+32bLktXrCHTYXapEob4d1dC5eDq/k42m67HQtCD4lTwPukJaXIaJDGXDSsgEcNou
+kWi1SPkLf7t7zVaaEFBFeVMDlsM6PYwxHnmN9h09jh8GwDT1b09uW/hFWTRbDSXG
+TDfyDpw2VyxUabrFJHarhYF3yjCVTV3fJKH4XoGWNwoSZo2cpZwwDmVmPvRMhad7
+UO2t9ZEMfzad+Vtc7vEN2A8XiMjN6gTAl+fr7L2YGuEHG90t4Pk4z7aGFFD0giDN
+ZiK1CmiMiPdmqi2GTI1S7hg2ptpZpl3VhGU+0/jG4AncRqiAKQ2Sv4wXzzT0wpuB
++4hzqGQ2x5XXu+R16yN6X987QGpATn0m/bvLHJJFlMGmR20joBwpas8cTpQmzKsd
+LLV3dwWD1LpC2eMtlxG2
+=faAw
+-----END PGP SIGNATURE-----
diff --git a/kmod-7.tar.xz b/kmod-7.tar.xz
new file mode 100644
index 0000000..e3b49d7
--- /dev/null
+++ b/kmod-7.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9806ee5eeffe7e0c41959f6284795dca2fd1b1eade975524913536c7bef07af7
+size 981936
diff --git a/kmod-so-version.diff b/kmod-so-version.diff
index 00f0b93..3794124 100644
--- a/kmod-so-version.diff
+++ b/kmod-so-version.diff
@@ -1,33 +1,18 @@
-Upstream: this patch is too complex for upstream to handle
-
-Change the kmod Makefile from using -version-info to -version-number
-to make it clear that the kmod project is not trying to subvert the
-libtool "interface" number concept, but in fact does not do
-libtool-style counting.
-
-References: <alpine.LNX.2.01.1202070049200.12889@frira.zrqbmnf.qr>
-References: http://lists.gnu.org/archive/html/libtool/2012-02/msg00011.html
-
----
- Makefile.am | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-Index: kmod-6/Makefile.am
-===================================================================
---- kmod-6.orig/Makefile.am
-+++ kmod-6/Makefile.am
-@@ -39,10 +39,6 @@ SED_PROCESS = \
+diff -ur kmod-7.orig/Makefile.am kmod-7/Makefile.am
+--- kmod-7.orig/Makefile.am 2012-04-18 12:54:59.140122820 +0200
++++ kmod-7/Makefile.am 2012-04-18 12:56:06.086310478 +0200
+@@ -33,10 +33,6 @@
%.pc: %.pc.in Makefile
$(SED_PROCESS)
-LIBKMOD_CURRENT=3
--LIBKMOD_REVISION=0
+-LIBKMOD_REVISION=1
-LIBKMOD_AGE=1
-
noinst_LTLIBRARIES = libkmod/libkmod-util.la
libkmod_libkmod_util_la_SOURCES = libkmod/libkmod-hash.c \
libkmod/libkmod-hash.h \
-@@ -71,7 +67,7 @@ EXTRA_DIST += libkmod/libkmod.sym
+@@ -65,7 +61,7 @@
EXTRA_DIST += libkmod/COPYING libkmod/README
libkmod_libkmod_la_LDFLAGS = $(AM_LDFLAGS) \
diff --git a/kmod.changes b/kmod.changes
index 61d95ac..72a166d 100644
--- a/kmod.changes
+++ b/kmod.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Apr 18 10:58:03 UTC 2012 - rmilasan@suse.com
+
+- Update to new upstream release 7
+ * build-sys: don't set CFLAGS and LDFLAGS.
+ * build-sys: re-organize configure.ac.
+ * configure.ac: Move link only flags out of CFLAGS and into LDFLAGS.
+ * Add CC_CHECK_LDFLAGS_APPEND m4 macro.
+ * config: use order /etc, /run, /lib.
+ * modprobe: set log prio to 0 if user passed -q arg.
+ * modprobe: always try to remove all modules in command line.
+ * modprobe: don't check if module builtin to decide if it's builtin.
+ * modprobe: fix error path in removing modules.
+
-------------------------------------------------------------------
Sat Mar 10 17:44:05 UTC 2012 - rschweikert@suse.com
diff --git a/kmod.spec b/kmod.spec
index 3c898d2..d600602 100644
--- a/kmod.spec
+++ b/kmod.spec
@@ -21,14 +21,11 @@ Name: kmod
Summary: Utilities to load modules into the kernel
License: LGPL-2.1+ and GPL-2.0+
Group: System/Kernel
-Version: 6
+Version: 7
Release: 0
-Url: http://www.politreco.com/2011/12/announce-kmod-2/
-
-#Git-Web: http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary
-#Git-Clone: git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod
-Source: %name-%version.tar.xz
-Source2: %name-%version.tar.sign
+Url: http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary
+Source0: ftp://ftp.kernel.org/pub/linux/utils/kernel/%{name}/%{name}-%{version}.tar.xz
+Source1: ftp://ftp.kernel.org/pub/linux/utils/kernel/%{name}/%{name}-%{version}.tar.sign
Patch1: kmod-so-version.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -75,7 +72,7 @@ list modules, also checking its properties, dependencies and aliases.
Summary: Development files for libkmod
License: LGPL-2.1+
Group: Development/Libraries/C and C++
-Requires: %lname = %version
+Requires: %lname = %{version}
%description -n libkmod-devel
libkmod was created to allow programs to easily insert, remove and
@@ -89,11 +86,15 @@ in %lname.
%patch -P 1 -p1
%build
-autoreconf -fi;
+autoreconf -fi
# The extra --includedir gives us the possibility to detect dependent
# packages which fail to properly use pkgconfig.
-%configure --with-xz --with-zlib --includedir=%_includedir/%name-%version \
- --with-rootlibdir=%{_libdir} --bindir=%{_bindir}
+%configure \
+ --with-xz \
+ --with-zlib \
+ --includedir=%_includedir/%{name}-%{version} \
+ --with-rootlibdir=%{_libdir} \
+ --bindir=%{_bindir}
make %{?_smp_mflags}
%install