diff --git a/libvoikko-add-pkgconfig.patch b/libvoikko-add-pkgconfig.patch
deleted file mode 100644
index 53f1633..0000000
--- a/libvoikko-add-pkgconfig.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 2171)
-+++ configure.ac	(working copy)
-@@ -103,5 +103,5 @@
- dnl Default compiler settings
- CFLAGS="$CFLAGS -Wall -Werror -pedantic -std=c99 -D_POSIX_C_SOURCE=200112L"
- 
--AC_CONFIG_FILES([Makefile src/Makefile])
-+AC_CONFIG_FILES([Makefile src/Makefile src/libvoikko.pc])
- AC_OUTPUT
-Index: src/libvoikko.pc.in
-===================================================================
---- src/libvoikko.pc.in	(revision 0)
-+++ src/libvoikko.pc.in	(revision 0)
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: libvoikko
-+Description: Library for spellcheckers and hyphenators
-+Version: @VERSION@
-+Libs: -L${libdir} -lvoikko
-+Libs.private: -lmalaga
-+Cflags: -I${includedir}
-Index: src/Makefile.am
-===================================================================
---- src/Makefile.am	(revision 2171)
-+++ src/Makefile.am	(working copy)
-@@ -17,3 +17,6 @@
- 
- dist_man_MANS = voikkospell.1 voikkohyphenate.1
- 
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = libvoikko.pc
-+
diff --git a/libvoikko.spec b/libvoikko.spec
index b1a18c2..28c4335 100644
--- a/libvoikko.spec
+++ b/libvoikko.spec
@@ -1,23 +1,18 @@
 Name:           libvoikko
-Version:        1.7
-Release:        3%{?dist}
+Version:        2.0
+Release:        0.1.rc1%{?dist}
 Summary:        Voikko is a library for spellcheckers and hyphenators
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://voikko.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
-# Commented out the usual format of test release URLs
-#Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc2.tar.gz
-# This patch adds a libvoikko.pc file for use with pkg-config. The patch has
-# been committed to upstream SVN.
-Patch0:         libvoikko-add-pkgconfig.patch
+# The usual format of stable release URLs
+#Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
+# The usual format of test release URLs
+Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  malaga-devel >= 7.8
-# These are temporarily needed for autoreconf and the AM_ICONV macro as long as
-# the pkgconfig patch is used.
-BuildRequires:  gettext-devel libtool
 Requires:       malaga-suomi-voikko >= 0.7.3
 
 %description
@@ -53,10 +48,6 @@ scripts.
 
 %prep
 %setup -q
-%patch0 -p0
-# configure.ac and src/Makefile.am have been patched, so this is needed for
-# the patches to actually have an effect.
-autoreconf
 
 
 %build
@@ -88,10 +79,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 
 %files -n voikko-tools
+%defattr(-,root,root,-)
 %{_bindir}/voikkospell
 %{_bindir}/voikkohyphenate
+%{_bindir}/voikkogc
 %{_mandir}/man1/voikkohyphenate.1.gz
 %{_mandir}/man1/voikkospell.1.gz
+%{_mandir}/man1/voikkogc.1.gz
 
 %files devel
 %defattr(-,root,root,-)
@@ -101,6 +95,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libvoikko.pc
 
 %changelog
+* Sat Aug 23 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.0-0.1.rc1
+- New release candidate, including the new voikkogc tool in voikko-tools
+- Add defattr to voikko-tools
+- Drop upstreamed pkg-config patch
+
 * Fri May 30 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.7-3
 - Add Requires pkgconfig to -devel