diff --git a/VERSION b/VERSION
index 4a36342..cb2b00e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.0
+3.0.1
diff --git a/configure.in.in b/configure.in.in
index 07350bd..fce3598 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -6,14 +6,18 @@
 
 ## some common checks
 @YAST2-CHECKS-COMMON@
-@YAST2-CHECKS-YCP@
 
 AX_CHECK_DOCBOOK
 
 ## Nasty hack: xgettext doesn't work for XML files, so let's symlink it
-( cd src/control; ln -sf firstboot.xml firstboot.glade )
+( cd control; ln -sf firstboot.xml firstboot.glade )
 
-find src/control -name \*.glade | LC_ALL=C sort > POTFILES
+find control -name \*.glade | LC_ALL=C sort > POTFILES
+
+# this module does not have any YCP modules
+# (defined explicitly here as using (@)YAST2-CHECKS-YCP(@) would add yast2-core
+# build dependency back)
+AM_CONDITIONAL([HAS_YCP_MODULES], [false])
 
 ## and generate the output...
 @YAST2-OUTPUT@
diff --git a/package/yast2-firstboot.changes b/package/yast2-firstboot.changes
index 0b9f362..0fbc1b4 100644
--- a/package/yast2-firstboot.changes
+++ b/package/yast2-firstboot.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Sep 13 11:57:58 UTC 2013 - lslezak@suse.cz
+
+- properly symlink firstboot.xml file (for collecting translatable
+  strings by "make pot")
+- removed obsolete BuildRequires (perl-XML-Writer, sgml-skel,
+  yast2, yast2-installation, yast2-testsuite, yast2-xml)
+- 3.0.1
+
 -------------------------------------------------------------------
 Wed Jul 31 08:29:10 UTC 2013 - yast-devel@opensuse.org
 
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
deleted file mode 100644
index e85fbc8..0000000
--- a/testsuite/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Makefile.am for .../testsuite
-#
-# Do not edit this file (Makefile.am) as it will be overwritten!
-#
-
-AUTOMAKE_OPTIONS = dejagnu
-EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.rb)
-
-testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite
-
-all-local: $(testsuite_prepare)
-	make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir)
-
-clean-local: $(testsuite_prepare)
-	make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean
-
-check-local: $(testsuite_prepare)
-	make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check
-
-# EOF
diff --git a/yast2-firstboot.spec.in b/yast2-firstboot.spec.in
index 442cbe8..e25ecec 100644
--- a/yast2-firstboot.spec.in
+++ b/yast2-firstboot.spec.in
@@ -4,11 +4,7 @@
 @HEADER@
 Group:          System/YaST
 License:        GPL-2.0
-BuildRequires:	yast2-xml update-desktop-files yast2-devtools yast2-testsuite docbook-xsl-stylesheets libxslt perl-XML-Writer sgml-skel update-desktop-files
-# Internet.ycp moved to yast2.rpm
-BuildRequires:	yast2 >= 2.16.6
-# Installation startup scripts
-BuildRequires:	yast2-installation
+BuildRequires:	update-desktop-files yast2-devtools docbook-xsl-stylesheets libxslt
 
 # yast2/NeworkDevices -> yast2/NetworkInterfaces
 Requires:	yast2 >= 2.16.23
@@ -52,19 +48,29 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/firstboot/scripts
 
 %files
 %defattr(-,root,root)
+%dir @ystartupdir@/startup
 %dir @ystartupdir@/startup/Firstboot-Stage
 @ystartupdir@/startup/Firstboot-Stage/*
 @ystartupdir@/startup/YaST2.Firstboot
 @clientdir@/firstboot_*.rb
 @clientdir@/firstboot.rb
+%dir @yncludedir@
 %dir @yncludedir@/firstboot
 @yncludedir@/firstboot/*.rb
+%dir @moduledir@
 @moduledir@/Firstboot.*
+%dir @scrconfdir@
 @scrconfdir@/*.scr
 /var/adm/fillup-templates/sysconfig.firstboot
 /usr/share/firstboot
 %doc @docdir@
 %doc COPYING
+%dir /etc/YaST2/
 /etc/YaST2/*.xml
+%dir /usr/share/autoinstall
+%dir /usr/share/autoinstall/modules
 /usr/share/autoinstall/modules/firstboot.desktop
-/usr/share/YaST2/schema/autoyast/rnc/firstboot.rnc
+%dir @schemadir@
+%dir @schemadir@/autoyast
+%dir @schemadir@/autoyast/rnc
+@schemadir@/autoyast/rnc/firstboot.rnc