diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 1e4e9a0..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: ser
-# $Id$
-NAME := ser
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/ser-0.9.6-axp.patch b/ser-0.9.6-axp.patch
new file mode 100644
index 0000000..14d20ee
--- /dev/null
+++ b/ser-0.9.6-axp.patch
@@ -0,0 +1,12 @@
+diff -up ser-0.9.6/Makefile.defs.axp ser-0.9.6/Makefile.defs
+--- ser-0.9.6/Makefile.defs.axp	2007-12-04 15:57:03.000000000 +0100
++++ ser-0.9.6/Makefile.defs	2007-12-04 15:57:05.000000000 +0100
+@@ -794,7 +794,7 @@ ifeq		($(CC_NAME), gcc)
+ 				CFLAGS= -O9 -funroll-loops $(PROFILE)  -Wall 
+ 			#if gcc 4.0+
+ ifeq			($(CC_SHORTVER), 4.x)
+-					CFLAGS+=-minline-all-stringops
++					CFLAGS+=
+ else
+ 			#if gcc 3.4+
+ ifeq			($(CC_SHORTVER), 3.4)
diff --git a/ser.spec b/ser.spec
index c92265e..03ec50e 100644
--- a/ser.spec
+++ b/ser.spec
@@ -1,15 +1,15 @@
 %define special_modules mysql jabber cpl-c postgres pa
 %define serweb_version 0.9.4
 
-%if "%{fedora}" >= "4"
+%if 0%{?fedora} >= 4
    %define serweb true
 %endif
 
 Summary: SIP Express Router
 Name: ser
 Version: 0.9.6
-Release: 14%{?dist}
-License: GPL
+Release: 17%{?dist}
+License: GPLv2+
 Group: System Environment/Daemons
 Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz
 Source1: ftp://ftp.berlios.de/pub/ser/latest/contrib/serweb-%{serweb_version}.tar.gz
@@ -17,13 +17,15 @@ Source2: serweb.conf
 Source3: ser.init
 Patch0: serweb-path.patch
 Patch1: ser-0.9.6-sysdef.patch
+Patch2: ser-0.9.6-axp.patch
 URL: http://www.iptel.org/ser/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: expat-devel, libxml2-devel, mysql-devel, postgresql-devel, bison
 BuildRequires: flex
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
+Requires(post): chkconfig
+Requires(preun): chkconfig
+# for /sbin/service
+Requires(preun): initscripts
 
 %description
 A high-performance, configurable SIP server. It can act as registrar, proxy
@@ -73,6 +75,7 @@ SERWEB is web toolbox for SIP Express Router (ser). It can be used for:
 %setup -q -a 1
 %patch0 -p1 -b .path
 %patch1 -p1 -b .sysdef
+%patch2 -p1 -b .axp
 
 # Enable SQL support for the acc module
 sed -i -e 's/#DEFS+=-DSQL_ACC/DEFS+=-DSQL_ACC/' modules/acc/Makefile 
@@ -82,10 +85,10 @@ find -name '.cvsignore' -exec rm -f {} \;
 
 
 %build
-%{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules/
+CFLAGS="%{optflags}" %{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules/
 
 for MOD in %{special_modules}; do
-	%{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules/
+	CFLAGS="%{optflags}" %{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules/
 done
 
 %install
@@ -215,6 +218,18 @@ fi
 %endif
 
 %changelog
+* Mon Feb 16 2009 Oliver Falk <oliver@linux-kernel.at> - 0.9.6-17
+- Do not use -minline-all-stringops on alpha, alpha gcc doesn't
+  understand that
+
+* Mon Feb 16 2009 Dennis Gilmore <dennis@ausil.us> - 0.9.6-16
+- use fedora optimisation flags
+
+* Mon Jul  7 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.9.6-15
+- fix conditional comparison
+- fix license tag
+- fix unnecessary file deps
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.9.6-14
 - Autorebuild for GCC 4.3