diff --git a/.cvsignore b/.cvsignore
index 41b372d..43e7c30 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-vala-0.1.5.tar.bz2
+vala-0.1.4.tar.bz2
diff --git a/sources b/sources
index bb51286..b16f516 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4e082ecb7f60ebdc49f3bd19ae7ebca2  vala-0.1.5.tar.bz2
+f914a5d7d3a92d1cb6af69fb4bb98002  vala-0.1.4.tar.bz2
diff --git a/vala.spec b/vala.spec
index 792bbe1..47866fd 100644
--- a/vala.spec
+++ b/vala.spec
@@ -1,5 +1,5 @@
 Name:           vala
-Version:        0.1.5
+Version:        0.1.4
 Release:        2%{?dist}
 Summary:        A modern programming language for GNOME
 
@@ -44,22 +44,22 @@ applications and libraries written in C.
 This package contains development files for %{name}. This is not necessary for
 using the %{name} compiler.
 
-%package        tools
-Summary:        Tools for creating projects and bindings for %{name}
+%package        vapigen
+Summary:        Bindings generators for %{name}
 Group:          Development/Languages
-License:        LGPLv2+
+# Most files are LGPLv2.1+, but gapi*.pl files are GPLv2
+License:        LGPLv2+ and GPLv2
 Requires:       %{name} = %{version}-%{release}
-Provides:       %{name}-vapigen = %{version}-%{release}
-Obsoletes:      %{name}-vapigen < %{version}-%{release}
+Requires:       perl(XML::Twig)
 
-%description    tools
+%description    vapigen
 Vala is a new programming language that aims to bring modern programming
 language features to GNOME developers without imposing any additional
 runtime requirements and without using a different ABI compared to
 applications and libraries written in C.
 
-This package contains tools to generate Vala projects, as well as API bindings
-from existing C libraries, allowing access from Vala programs.
+This package contains tools to generate Vala API bindings from existing
+C libraries, allowing access from Vala programs.
 
 %package        docs
 Summary:        Documentation for %{name}
@@ -82,7 +82,7 @@ This package contains documentation in a devhelp HTML book.
 
 
 %build
-%configure --enable-vapigen --enable-gen-project
+%configure --enable-vapigen
 # Don't use rpath!
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -108,7 +108,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/valac
 %{_datadir}/vala
 %{_libdir}/libvala.so.*
-%{_mandir}/*/valac*
+%{_mandir}/*/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -116,12 +116,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libvala.so
 %{_libdir}/pkgconfig/vala-1.0.pc
 
-%files tools
+%files vapigen
 %defattr(-,root,root,-)
-%{_bindir}/*gen*
+%{_bindir}/*gen
 %{_bindir}/vapicheck
 %{_libdir}/vala
-%{_mandir}/*/*gen*
 
 %files docs
 %defattr(-,root,root,-)
@@ -130,12 +129,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Dec  4 2007 Michel Salim <michel.sylvan@gmail.com> - 0.1.5-2
-- Enable project generator tool
-
-* Tue Nov 27 2007 Michel Salim <michel.sylvan@gmail.com> - 0.1.5-1
-- Update to 0.1.5
-
 * Sun Nov 11 2007 Michel Salim <michel.sylvan@gmail.com> - 0.1.4-2
 - Add build dependency on devhelp