diff --git a/libidn-1.29.tar.gz b/libidn-1.29.tar.gz
deleted file mode 100644
index cdf15c9..0000000
--- a/libidn-1.29.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fb82747dbbf9b36f703ed27293317d818d7e851d4f5773dedf3efa4db32a7c7c
-size 3474087
diff --git a/libidn-1.29.tar.gz.sig b/libidn-1.29.tar.gz.sig
deleted file mode 100644
index e93d5a7..0000000
--- a/libidn-1.29.tar.gz.sig
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-iQEcBAABCAAGBQJT599lAAoJEIYLf7sy+BGdXcUH+gLxDYV7qF1TOavCF7pm7I7a
-J/fAXCew8Ggx/BDcIpmXRLKZg+aFBx+03MHSwboU+gYk43tawHsIdQm4FTG/s/BA
-8esvqRh4Vo5tcPRTbjEi0/wBZNTIfiOTh2LH/wBMbAWRWJ6LDMM6Xb97oQvnw0gC
-1prLIMk+HJSS2N3eKFOY9X9aauXOJHb7oHrPBoqCET1HnNFtW6xJmPLMPx9R1z55
-ouuzWpAJJUhHS5xE40ykBgDbFOCHr1JvZiz2oBqiWZtQE1gPeLzKkkah5fNkLTH5
-JVbHe9fPrW7u7h0+Y++dipbDaIlOFqw3624Pc7qy3UZhVrDiRtk8ZPTkcm0ISAA=
-=Kt6j
------END PGP SIGNATURE-----
diff --git a/libidn-1.30.tar.gz b/libidn-1.30.tar.gz
new file mode 100644
index 0000000..22e6308
--- /dev/null
+++ b/libidn-1.30.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39b9fc94d74081c185757b12e0891ce5a22db55268e7d1bb24533ff4432eb053
+size 3474545
diff --git a/libidn-1.30.tar.gz.sig b/libidn-1.30.tar.gz.sig
new file mode 100644
index 0000000..5b0d644
--- /dev/null
+++ b/libidn-1.30.tar.gz.sig
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAABCAAGBQJU9ED6AAoJEIYLf7sy+BGdGw0H/1VvmZPL6Zbb2JhWbbt7xyMK
+hf4PBUR8u9cmeAJugUB2bqMqKi1nlQSwijN/a4ZbXU2ecuw+DzogBmSL9msqu5pJ
+iflb9qO3OUqJlzBnFY0EU4TiY4dpF7UFDci/FJQblSsGtFaWLGUAE1LlGvOlz/jI
+gXvgcnCcNothxA0M4yaCkzYrX7XW29KwLGcKFG+YgIri/2G7usl3Q+xv6bufTAH7
+OWqfdAM1KfJWqYcBBSEJj1X7xDgHaDZ+YMPcS44up5c/fCBfnb3uSph8+lwBvWrk
+tBwiJolKD5DYOwbx6TkCBkxd4J8fh2Fck5xTY0swshcfGekFJDwvPDLxQVkqw1E=
+=CejY
+-----END PGP SIGNATURE-----
diff --git a/libidn.changes b/libidn.changes
index a3c91d3..8f94dcf 100644
--- a/libidn.changes
+++ b/libidn.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar 13 13:49:20 UTC 2015 - tchvatal@suse.com
+
+- Version bump to 1.30:
+  * punycode.{c,h} files were reimported
+- Cleanup with spec-cleaner
+
 -------------------------------------------------------------------
 Mon Oct 20 13:10:56 UTC 2014 - i@marguerite.su
 
diff --git a/libidn.spec b/libidn.spec
index 2eb7c37..3cd81d5 100644
--- a/libidn.spec
+++ b/libidn.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libidn
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,18 +18,16 @@
 
 %define lname	libidn11
 Name:           libidn
-Version:        1.29
+Version:        1.30
 Release:        0
 Summary:        Support for Internationalized Domain Names (IDN)
 License:        (GPL-2.0+ or LGPL-3.0+) and GPL-3.0+
 Group:          Development/Libraries/C and C++
 Url:            http://www.gnu.org/software/libidn/
 Source0:        http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
-Source1:        baselibs.conf
-Source2:        http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig
-Source3:        libidn.keyring
-#can't be used without build cycles, so just check the signature in validator
-#BuildRequires:  gpg-offline
+Source1:        http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig
+Source2:        libidn.keyring
+Source3:        baselibs.conf
 BuildRequires:  pkg-config
 Requires(pre):  %{install_info_prereq}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -51,9 +49,6 @@ IDNA is supported.
 Summary:        Command line utility to convert Int. Domain Names
 License:        (GPL-2.0+ or LGPL-3.0+) and GPL-3.0+
 Group:          Productivity/Networking/DNS/Utilities
-# O/P added for 12.3
-Obsoletes:      libidn < %{version}-%{release}
-Provides:       libidn = %{version}-%{release}
 
 %description tools
 GNU Libidn is an implementation of the Stringprep, Punycode, and IDNA
@@ -72,10 +67,6 @@ Compatible Encoding (ACE) via IDNA is supported.
 Summary:        Support for Internationalized Domain Names (IDN)
 License:        (GPL-2.0+ or LGPL-3.0+) and GPL-3.0+
 Group:          System/Libraries
-# bug437293
-%ifarch ppc64
-Obsoletes:      libidn-64bit
-%endif
 
 %description -n %{lname}
 GNU Libidn is an implementation of the Stringprep, Punycode, and IDNA
@@ -96,10 +87,6 @@ License:        LGPL-2.1+
 Group:          Development/Libraries/C and C++
 Requires:       %{lname} = %{version}
 Requires:       glibc-devel
-# bug437293
-%ifarch ppc64
-Obsoletes:      libidn-devel-64bit
-%endif
 
 %description devel
 GNU Libidn is an implementation of the Stringprep, Punycode, and IDNA
@@ -118,28 +105,29 @@ IDNA is supported.
 %setup -q
 
 %build
-%configure --with-pic --disable-static --disable-gtk-doc
-make %{?_smp_mflags} V=1
+%configure \
+    --disable-silent-rules \
+    --with-pic \
+    --disable-static \
+    --disable-gtk-doc
+make %{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
-
-rm -f %{buildroot}/%{_infodir}/dir
-rm -f %{buildroot}%{_libdir}/libidn.la
+find %{buildroot} -type f -name "*.la" -delete -print
 
 %find_lang %{name}
 
 %check
 %if ! 0%{?qemu_user_space_build}
-export SUSE_ASNEEDED=0
-make check %{?_smp_mflags} V=1
+make check %{?_smp_mflags}
 %endif
 
 %post tools
-%install_info --info-dir=%{_infodir} %{_infodir}/libidn.info.gz
+%install_info --info-dir=%{_infodir} %{_infodir}/libidn.info.*
 
 %postun tools
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/libidn.info.gz
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/libidn.info.*
 
 %post -n %{lname} -p /sbin/ldconfig