diff --git a/.gitignore b/.gitignore
index c06df21..9941fbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 pdns-2.9.22.tar.gz
+/pdns-3.0-pre.20110327.2103.tar.gz
diff --git a/pdns-fix-crash-on-sigstop.patch b/pdns-fix-crash-on-sigstop.patch
deleted file mode 100644
index 56e543d..0000000
--- a/pdns-fix-crash-on-sigstop.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur pdns-2.9.22.orig/pdns/unix_semaphore.cc pdns-2.9.22/pdns/unix_semaphore.cc
---- pdns-2.9.22.orig/pdns/unix_semaphore.cc	2010-12-14 17:18:02.667000233 +0100
-+++ pdns-2.9.22/pdns/unix_semaphore.cc	2010-12-14 17:18:08.138000485 +0100
-@@ -156,7 +156,11 @@
- 
- int Semaphore::wait()
- {
--  return sem_wait(m_pSemaphore);
-+  int ret;
-+  do
-+    ret = sem_wait(m_pSemaphore);
-+  while (ret == -1 && errno == EINTR);
-+  return ret;
- }
- int Semaphore::tryWait()
- {
diff --git a/pdns-fix-postgres-detection.patch b/pdns-fix-postgres-detection.patch
index 2a21872..288b5bf 100644
--- a/pdns-fix-postgres-detection.patch
+++ b/pdns-fix-postgres-detection.patch
@@ -1,7 +1,7 @@
-diff -up pdns-2.9.22/configure.orig pdns-2.9.22/configure
---- pdns-2.9.22/configure.orig	2010-01-14 20:40:16.000000000 +0100
-+++ pdns-2.9.22/configure	2010-01-14 20:41:13.000000000 +0100
-@@ -23298,7 +23298,7 @@ if test "${with_pgsql+set}" = set; then
+diff -up pdns-3.0-pre.20110327.2103/configure.orig pdns-3.0-pre.20110327.2103/configure
+--- pdns-3.0-pre.20110327.2103/configure.orig	2011-03-28 09:44:22.690000393 +0200
++++ pdns-3.0-pre.20110327.2103/configure	2011-03-28 09:46:26.822000001 +0200
+@@ -18224,7 +18224,7 @@ if test "${with_pgsql+set}" = set; then 
    withval=$with_pgsql; PGSQL_lib_check="$withval/lib/pgsql $with_pgsql/lib"
  	PGSQL_inc_check="$withval/include/pgsql"
  else
@@ -10,8 +10,8 @@ diff -up pdns-2.9.22/configure.orig pdns-2.9.22/configure
  	PGSQL_inc_check="/usr/local/pgsql/include/pgsql /usr/include /usr/local/include/postgresql/ /usr/local/include /opt/pgsql/include/pgsql /opt/pgsql/include /usr/include/pgsql/ /usr/include/postgresql"
  fi
  
-@@ -23318,8 +23318,7 @@ fi
- echo $ECHO_N "checking for PgSQL library directory... $ECHO_C" >&6; }
+@@ -18244,8 +18244,7 @@ fi
+ $as_echo_n "checking for PgSQL library directory... " >&6; }
  	PGSQL_libdir=
  	for m in $PGSQL_lib_check; do
 -	        if test -d "$m" && \
diff --git a/pdns-gcc44.patch b/pdns-gcc44.patch
deleted file mode 100644
index cba5412..0000000
--- a/pdns-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up pdns-2.9.22/pdns/misc.hh.orig pdns-2.9.22/pdns/misc.hh
---- pdns-2.9.22/pdns/misc.hh.orig	2009-02-26 17:09:41.000000000 +0100
-+++ pdns-2.9.22/pdns/misc.hh	2009-02-26 17:09:54.000000000 +0100
-@@ -20,6 +20,7 @@
- #define MISC_HH
- #include <stdint.h>
- #include <cstring>
-+#include <cstdio>
- 
- #if 0
- #include <iostream>
diff --git a/pdns.spec b/pdns.spec
index 9c40c38..d5c0084 100644
--- a/pdns.spec
+++ b/pdns.spec
@@ -1,17 +1,17 @@
+%global alphatag pre.20110327.2103
+
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
-Version:	2.9.22
-Release:	13%{?dist}
+Version:	3.0
+Release:	1.%{alphatag}%{?dist}
 
 Group:		System Environment/Daemons
 License:	GPLv2
 URL:		http://powerdns.com
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:	http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
+Source0:	http://downloads.powerdns.com/releases/%{name}-%{version}-%{alphatag}.tar.gz
 Patch0:		%{name}-fixinit.patch
-Patch1:		%{name}-gcc44.patch
-Patch2:		pdns-fix-postgres-detection.patch
-Patch3:		pdns-fix-crash-on-sigstop.patch
+Patch1:		pdns-fix-postgres-detection.patch
 
 Requires(post):	%{_sbindir}/useradd, /sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig
@@ -81,11 +81,9 @@ This package contains the SQLite backend for %{name}
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{alphatag}
 %patch0 -p1 -b .fixinit
-%patch1 -p1 -b .gcc44
-%patch2 -p1 -b .postgres
-%patch3 -p1 -b .sigstop
+%patch1 -p1 -b .postgres
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}"
@@ -184,6 +182,11 @@ fi
 
 
 %changelog
+* Mon Mar 28 2011 Ruben Kerkhof <ruben@rubenkerkhof.com> 3.0-1.pre.20110327.2103
+- Upstream released new pre-release version
+- Now with DNSSEC support
+- Drop merged patches
+
 * Wed Mar 23 2011 Dan Horák <dan@danny.cz> - 2.9.22-13
 - rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
 
diff --git a/sources b/sources
index 624e7eb..a015fa9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a6ff842733aca885577eb54e983a1ff  pdns-2.9.22.tar.gz
+b4ea207b6c43d0f39c96d3156f5fba95  pdns-3.0-pre.20110327.2103.tar.gz