diff --git a/freeradius-server.changes b/freeradius-server.changes
index bb55aa3..eb537bc 100644
--- a/freeradius-server.changes
+++ b/freeradius-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 14 13:10:11 UTC 2015 - tchvatal@suse.com
+
+- Do not disable as-needed build
+- Remove the with_sysconfig switch and just stick with versions
+
 -------------------------------------------------------------------
 Tue Jan 13 09:42:05 UTC 2015 - vcizek@suse.com
 
diff --git a/freeradius-server.spec b/freeradius-server.spec
index b393356..11ec475 100644
--- a/freeradius-server.spec
+++ b/freeradius-server.spec
@@ -16,13 +16,9 @@
 #
 
 
-%global with_sysvinit 0
 %define unitname radiusd
 %define apxs2 apxs2-prefork
 %define apache2_sysconfdir %(%{_sbindir}/%{apxs2} -q SYSCONFDIR)
-%if 0%{?suse_version} < 1310
-%global with_sysvinit 1
-%endif
 Name:           freeradius-server
 Version:        3.0.6
 Release:        0
@@ -31,6 +27,7 @@ License:        GPL-2.0 and LGPL-2.1
 Group:          Productivity/Networking/Radius/Servers
 Url:            http://www.freeradius.org/
 Source:         ftp://ftp.freeradius.org/pub/freeradius/%{name}-%{version}.tar.bz2
+Source99:       ftp://ftp.freeradius.org/pub/freeradius/%{name}-%{version}.tar.bz2.sig
 Source1:        radiusd.service
 Source2:        freeradius-tmpfiles.conf
 Patch2:         freeradius-server-2.1.6-rcradiusd.patch
@@ -184,7 +181,7 @@ This plugin provides the postgresql support for the FreeRADIUS server project.
 %package sqlite
 Summary:        SQLite support for freeradius
 Group:          System Environment/Daemons
-BuildRequires:  sqlite-devel
+BuildRequires:  sqlite3-devel
 Requires:       %{name} = %{version}
 
 %description sqlite
@@ -204,13 +201,7 @@ modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
 DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
 TIME="\"$(date -d "${modified}" "+%%R")\""
 find . -type f -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} +
-# This package failed when testing with -Wl,-as-needed being default.
-# So we disable it here, if you want to retest, just delete this comment and the line below.
-export SUSE_ASNEEDED=0
-export CFLAGS="%{optflags} -DLDAP_DEPRECATED -fstack-protector"
-%ifarch x86_64 ppc ppc64 s390 s390x %{arm}
-export CFLAGS="$CFLAGS -fPIC -DPIC"
-%endif
+export CFLAGS="%{optflags} -DLDAP_DEPRECATED -fstack-protector -fPIC -DPIC"
 export LDFLAGS="-pie"
 %configure \
   --disable-static \
@@ -230,7 +221,6 @@ export LDFLAGS="-pie"
   --without-rlm_sql_db2 \
   --without-rlm_sql_firebird \
   --without-rlm_sql_iodbc \
-  --without-rlm_tralalala \
   --without-rlm_redis \
   --without-rlm_rediswho \
   --without-rlm_sql_oracle \
@@ -257,7 +247,7 @@ install -d     %{buildroot}%{_sysconfdir}/pam.d
 install -d     %{buildroot}%{_sysconfdir}/logrotate.d
 install -m 644 suse/radiusd-pam %{buildroot}%{_sysconfdir}/pam.d/radiusd
 install -m 644 suse/radiusd-logrotate %{buildroot}%{_sysconfdir}/logrotate.d/radiusd
-%if %{with_sysvinit}
+%if 0%{?suse_version} < 1140
 install -d -m 755 %{buildroot}%{_sysconfdir}/init.d
 install    -m 744 suse/rcradiusd %{buildroot}%{_sysconfdir}/init.d/freeradius
 ln -sf %{buildroot}%{_sysconfdir}/init.d/freeradius %{buildroot}%{_sbindir}/rcfreeradius
@@ -308,7 +298,7 @@ if [ $1 -eq 1 ]; then
 fi
 chgrp radiusd %{_sysconfdir}/raddb/certs/*
 
-%if %{with_sysvinit}
+%if 0%{?suse_version} < 1140
 %fillup_and_insserv freeradius
 %endif
 
@@ -318,21 +308,17 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{unitname}.conf
 %endif
 
 %preun
-%if %{with_sysvinit}
+%if 0%{?suse_version} < 1140
 %stop_on_removal freeradius
-%endif
-
-%if 0%{?suse_version} > 1140
+%else
 %service_del_preun %{unitname}.service
 %endif
 
 %postun
-%if %{with_sysvinit}
+%if 0%{?suse_version} < 1140
 %insserv_cleanup
 %restart_on_update freeradius
-%endif
-
-%if 0%{?suse_version} > 1140
+%else
 %service_del_postun %{unitname}.service
 %endif
 
@@ -347,11 +333,10 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{unitname}.conf
 # SUSE
 %config %{_sysconfdir}/pam.d/radiusd
 %config %{_sysconfdir}/logrotate.d/radiusd
-%if %{with_sysvinit}
+%if 0%{?suse_version} < 1140
 %config %{_sysconfdir}/init.d/freeradius
 %{_sbindir}/rcfreeradius
-%endif
-%if 0%{?suse_version} > 1140
+%else
 %{_sbindir}/rcradiusd
 %endif
 %dir %attr(755,radiusd,radiusd) %{_localstatedir}/lib/radiusd