diff --git a/.gitignore b/.gitignore
index 33130bf89..6d3db0c91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,7 @@ config.log
 config.status
 config.sub
 configure
-configure.in
+configure.ac
 depcomp
 install-sh
 ltmain.sh
@@ -29,11 +29,11 @@ libtool.m4
 missing
 pluglib-bindings.ami
 autodocs*.ami
+autodocs/doxygen.conf
 ylwrap
 *.pc
 stamp-h*
 package/*.tar.bz2
-package/*.spec
 # testsuites
 site.bak
 /test-driver
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 000000000..97167bbc1
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,8 @@
+require "yast/rake"
+
+Packaging.configuration do |conf|
+  conf.skip_license_check << /testsuite/ #skip all testsuites
+  conf.skip_license_check << /scr\/doc\/scr-arch.sda/ #skip binary file
+  conf.skip_license_check << /.*/ #skip all temporary, as there is too much failures
+end
+
diff --git a/VERSION b/VERSION
index cb2b00e4f..fd2a01863 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.1
+3.1.0
diff --git a/package/yast2-core.changes b/package/yast2-core.changes
index 1c6120d11..fb2088942 100644
--- a/package/yast2-core.changes
+++ b/package/yast2-core.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Sep 18 14:39:27 UTC 2013 - lslezak@suse.cz
+
+- do not use *.spec.in template, use *.spec file with RPM macros
+  instead
+- 3.1.0
+
 -------------------------------------------------------------------
 Wed Sep  4 14:24:39 UTC 2013 - mvidner@suse.com
 
diff --git a/yast2-core.spec.in b/package/yast2-core.spec
similarity index 55%
rename from yast2-core.spec.in
rename to package/yast2-core.spec
index 89bf6f658..f0f093d8a 100644
--- a/yast2-core.spec.in
+++ b/package/yast2-core.spec
@@ -1,9 +1,31 @@
-@HEADER-COMMENT@
-
-
-@HEADER@
-Group:	System/YaST
-License: GPL-2.0+
+#
+# spec file for package yast2-core
+#
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+
+Name:           yast2-core
+Version:        3.1.0
+Release:        0
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source0:        %{name}-%{version}.tar.bz2
+
+Group:	        System/YaST
+License:        GPL-2.0+
 # obviously
 BuildRequires:	gcc-c++ boost-devel libtool
 # we have a parser
@@ -11,7 +33,7 @@ BuildRequires:	flex bison
 # incompatible change, parser.h -> parser.hh
 BuildRequires:  automake >= 1.12
 # needed for all yast packages
-BuildRequires:	yast2-devtools
+BuildRequires:	yast2-devtools >= 3.0.6
 # testsuite
 BuildRequires:	dejagnu
 # autodocs
@@ -30,7 +52,9 @@ Obsoletes:	liby2util < 2.16.1
 This package contains the scanner, parser, and interpreter runtime
 library for the YCP scripting language used in YaST2.
 
-@HEADER-DEVEL@
+%package devel
+Requires:	yast2-core = %version
+
 Summary:	YaST2 - Core Libraries
 Provides:	liby2util-devel = 2.16.1
 Obsoletes:	liby2util-devel < 2.16.1
@@ -53,7 +77,8 @@ Summary:	YaST2 - Core Libraries
 %description debugger
 YCP debugger client.
 
-@PREP@
+%prep
+%setup -n %{name}-%{version}
 
 
 %build
@@ -66,13 +91,15 @@ sed -i SUBDIRS -e 's/autodocs//'
 %endif
 
 export SUSE_ASNEEDED=0 # disable --as-needed until this package is fixed
-@BUILD@
 
-@INSTALL@
-mkdir -p "$RPM_BUILD_ROOT"@logdir@
+%yast_build
+
+%install
+%yast_install
+
+mkdir -p "$RPM_BUILD_ROOT"%{yast_logdir}
 %perl_process_packlist
 
-@CLEAN@
 
 %post
 /sbin/ldconfig
@@ -93,28 +120,28 @@ fi
 %endif
 %dir /usr/share/YaST2
 
-%dir %attr(0700,root,root) @logdir@
-%dir @ybindir@
-%dir @plugindir@
-%dir @scrconfdir@
-%dir @execcompdir@/servers
-%dir @execcompdir@/servers_non_y2
+%dir %attr(0700,root,root) %{yast_logdir}
+%dir %{yast_ybindir}
+%dir %{yast_plugindir}
+%dir %{yast_scrconfdir}
+%dir %{yast_execcompdir}/servers
+%dir %{yast_execcompdir}/servers_non_y2
 
 /usr/bin/ycpc
 %{_libdir}/lib*.so.*
-@ybindir@/y2base
-@ybindir@/startshell
-@ybindir@/tty_wrapper
-@ybindir@/md_autorun
-@ybindir@/elf-arch
-@plugindir@/lib*.so.*
-@scrconfdir@/*.scr
-@execcompdir@/servers/scr
-@execcompdir@/servers_non_y2/ag_*
+%{yast_ybindir}/y2base
+%{yast_ybindir}/startshell
+%{yast_ybindir}/tty_wrapper
+%{yast_ybindir}/md_autorun
+%{yast_ybindir}/elf-arch
+%{yast_plugindir}/lib*.so.*
+%{yast_scrconfdir}/*.scr
+%{yast_execcompdir}/servers/scr
+%{yast_execcompdir}/servers_non_y2/ag_*
 # perl part (stdio agents)
 # *: regular build compresses them, debug does not
-%_mandir/man3/ycp.3pm*
-%_mandir/man3/YaST::SCRAgent.3pm*
+%{_mandir}/man3/ycp.3pm*
+%{_mandir}/man3/YaST::SCRAgent.3pm*
 %{perl_vendorlib}/ycp.pm
 %dir %{perl_vendorlib}/YaST
 %{perl_vendorlib}/YaST/SCRAgent.pm
@@ -127,17 +154,17 @@ fi
 
 %files devel
 %defattr(-,root,root)
-@ybindir@/ybcdump
+%{yast_ybindir}/ybcdump
 %{_libdir}/lib*.so
 %{_libdir}/lib*.la
-@plugindir@/lib*.so
-@plugindir@/lib*.la
-@includedir@
-@pkgconfigdir@/@RPMNAME@.pc
-%doc @docdir@
+%{yast_plugindir}/lib*.so
+%{yast_plugindir}/lib*.la
+%{yast_includedir}
+%{_libdir}/pkgconfig/yast2-core.pc
+%doc %{yast_docdir}
 %doc %{_datadir}/doc/yastdoc
-@ydatadir@/devtools/bin/generateYCPWrappers
+%{yast_ydatadir}/devtools/bin/generateYCPWrappers
 
 %files debugger
 %defattr(-,root,root)
-%attr(0755,-,-) /usr/lib/YaST2/bin/ycp-debugger
+%attr(0755,-,-) %{yast_ybindir}/ycp-debugger