diff --git a/indent-2.2.10.tar.bz2 b/indent-2.2.10.tar.bz2
deleted file mode 100644
index f871537..0000000
--- a/indent-2.2.10.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:37e60cae161071fb68739fffbe3e518d8a17dab4b0209d84e6ad1e5f4007394b
-size 531877
diff --git a/indent-2.2.10.tar.gz b/indent-2.2.10.tar.gz
new file mode 100644
index 0000000..1104898
--- /dev/null
+++ b/indent-2.2.10.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8a9b41be5bfcab5d8c1be74204b10ae78789fc3deabea0775fdced8677292639
+size 702667
diff --git a/indent-2.2.10.tar.gz.sig b/indent-2.2.10.tar.gz.sig
new file mode 100644
index 0000000..6184a8b
--- /dev/null
+++ b/indent-2.2.10.tar.gz.sig
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEABECAAYFAkmX5YMACgkQV4UaJNn8jXMKzwCg0mz1BvCS6WGbVJ0C97hjZNsp
+SR8An0g84eSAFDkXCyJwoQbiaQwwgrgS
+=z0xr
+-----END PGP SIGNATURE-----
diff --git a/indent.changes b/indent.changes
index e90debb..05ffca5 100644
--- a/indent.changes
+++ b/indent.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Feb 18 20:44:18 UTC 2015 - mpluskal@suse.com
+
+- Use url for source
+- Add gpg signature
+- Cleanup spec file with spec cleaner
+- Remove useless configure option --with-pic
+
 -------------------------------------------------------------------
 Fri Jul 20 05:00:55 UTC 2012 - coolo@suse.com
 
diff --git a/indent.keyring b/indent.keyring
new file mode 100644
index 0000000..f7915bd
--- /dev/null
+++ b/indent.keyring
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+mQGiBElSMsARBADZTJJDm8dR12eMorXmagsHQDkXZ88FjSnKVwlmBAf/gPNAaGhc
+jxyV07ceTLBFh+rqVO5KTTIgsrxcuoZdA7wJceU1Wsy3czaqrouJAFtwTSlXNPr7
+nT7IOoE3mygmjhmlNgkvO7SyJUzR/Aew8DXcvbw0SOtI+fR76W46K4yemwCg6NRN
+JppoTpmLwHoRQQBNJwzG26UEAILVpr8dBZtkrZoKhqbnJtU4NbVmaxOq8998uEj6
+rHNrKlYd0GOSQL8KBcqO60KABePOioHSyDalBQqs8eRE/4FZIBIW6TWD13TV2Ken
+bwnryqn5d9UGf9FuQrhgbcYD4B6L53LriFmCRJouT6tRpYCsq5KCXikFEM4sX601
+sg8eA/9ySAORRNqLx/QrtFkVU0cCcE3f6jtdImbRVQ1kAlGefO2Zqlp9Co4RdktJ
+rVqlyeyYUazpznNQKUJh5XBIlueH0+bdFnafCKD/b0TCtmLeORmJSmXkut8nSq7F
+ytYRPnynRZo3YCCTc7L7qO4YAix+ZrhoeeSRUeqKr13ra6Qzn7Q4RGF2aWQgSW5n
+YW1lbGxzIChpbmRlbnQgbWFpbnRhaW5lcikgPGRhdmlkQGluZ2FtZWxscy5ldT6I
+YAQTEQIAIAUCSVIywAIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEFeFGiTZ
+/I1zZVQAniJ63vNZRaI7x+Ejol5608Nh/koXAKDaBaBRj6Zac+0pxQu1ioUfTJnx
+xLkCDQRJUjLAEAgA6sJiHUJ7RHWbGbcnqZxLkfFuKMK2fbsza0IuL3rh7VAndrm9
+yYuN5V1kv/ANwq4Z2gpzUsUP7KlyFE3cM5i6myr7uey6Q36XChvajECk9Vi5Eiq9
+Lgck78DLxRacYoQamDYsOQCO3qWj81Ti3r9Oka5tgPQWMsIYA1oq+dU/ll0MWcvJ
+CLgLMNleOlV08q3YFhUtFy2mZy5sxdGt8UVD2V/ILqazpb4J8+9IPjbP7oDPzozI
+lQdP33BKyzkGakBnUTkSyEQvfle9B8hnV4cffA27MhtTFBdBXHCMLNEGEx/8+osz
+/Rf2QL7OMvQhmZUSEkqEXKM4uwjBbjm5TSZeXwADBQf/Y/+etP/kDsWzZo742YCO
+kTk6zOQvjJANB1WeZr5eS47zeNe7p7aX5e6n2Ycks2eniOfM3/T+P0Tcwc3w46Pj
+rwNGPoiIP6K65ql/WsUJqxTQV1JuwfN9Zne4/QZReewk6+bvwriUglKkn5hl3RUk
+pBwXvsHY+QSdk9Y0PPMMfK5fCMz1AHuol7czGlFjprAku+k98cmVbn2YIFnhmfhl
+YcyUyWxeQiAC34N/UPBauyXloWHndzd1yjT40KDr/dRThLgbRGQ2aMVeadbG6DIF
+kFJbsIaWYrxE5wKKemA4WLmo3FJN7k/XcplKXLTJFbtjexLv7PhYSWBXCeminmC4
+vohJBBgRAgAJBQJJUjLAAhsMAAoJEFeFGiTZ/I1zwmYAnj41kUsewQhRq6V2VpME
+gBTEzPkvAKDaegBoUhHKnBmAgqwUFJxvGicB4A==
+=e6az
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/indent.spec b/indent.spec
index 5bb8bd9..428a00a 100644
--- a/indent.spec
+++ b/indent.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package indent
 #
-# Copyright (c) 2012 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
@@ -17,30 +17,30 @@
 
 
 Name:           indent
-BuildRequires:  texinfo
 Version:        2.2.10
 Release:        0
-Source:         %{name}-%{version}.tar.bz2
+Summary:        Indent Formats C Source Code
+License:        GPL-3.0+
+Group:          Development/Languages/C and C++
+Url:            http://www.gnu.org/software/indent
+Source0:        ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
+Source1:        ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig
+Source2:        %{name}.keyring
 Patch0:         %{name}-%{version}-nothing_is_void.diff
 Patch1:         %{name}-%{version}-warnings.diff
 Patch2:         %{name}-%{version}-lcall.diff
 Patch3:         %{name}-%{version}-cdw.diff
 Patch4:         %{name}-%{version}-man.diff
-Url:            http://www.gnu.org/software/indent
+BuildRequires:  texinfo
+Requires(pre):  %{install_info_prereq}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Summary:        Indent Formats C Source Code
-License:        GPL-3.0+
-Group:          Development/Languages/C and C++
-PreReq:         %install_info_prereq
 
 %description
-indent can be used to make code easier to read. It can also convert
+Indent can be used to make code easier to read. It can also convert
 from one style of writing C code to another. indent understands a
 substantial amount of C syntax, but it also tries to cope with
 incomplete and malformed syntax.
 
-
-
 %prep
 %setup -q
 %patch0 -p1
@@ -50,24 +50,19 @@ incomplete and malformed syntax.
 %patch4
 
 %build
-%configure --with-pic
-# Parallel make doesn't work
-make
+%configure
+# parallel builds are broken
+make -j 1
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
-# indent.html is installed with %doc below
-rm -f $RPM_BUILD_ROOT/usr/doc/indent/indent.html $RPM_BUILD_ROOT%{_bindir}/texinfo2man $RPM_BUILD_ROOT/%{_infodir}/dir
-mv $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW.Big5 $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+# indent.html is installed with doc below
+rm -f %{buildroot}%{_prefix}/doc/indent/indent.html %{buildroot}%{_bindir}/texinfo2man %{buildroot}/%{_infodir}/dir
+mv %{buildroot}%{_datadir}/locale/zh_TW.Big5 %{buildroot}%{_datadir}/locale/zh_TW
 %find_lang %{name}
 
 %check
-echo =============== TEST BEGIN ===============
-make -C regression
-echo =============== TEST  END  ===============
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make %{?_smp_mflags} -C regression
 
 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz