diff --git a/.cvsignore b/.gitignore
similarity index 92%
rename from .cvsignore
rename to .gitignore
index 370d9bb..6d940de 100644
--- a/.cvsignore
+++ b/.gitignore
@@ -10,7 +10,7 @@ config.log
 config.status
 config.sub
 configure
-configure.in
+configure.ac
 depcomp
 install-sh
 missing
@@ -18,3 +18,4 @@ mkinstalldirs
 stamp-h
 power-management.pot
 autom4te.cache
+*.ami
diff --git a/VERSION b/VERSION
index 4a36342..fd2a018 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.0
+3.1.0
diff --git a/agents/.cvsignore b/agents/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/agents/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/agents/Makefile.am b/agents/Makefile.am
deleted file mode 100644
index 80fce89..0000000
--- a/agents/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Makefile.am for devtools/devtools/skeletons/config/agents
-#
-
diff --git a/package/.cvsignore b/package/.cvsignore
deleted file mode 100644
index 65d0b1a..0000000
--- a/package/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.spec
-*.bz2
diff --git a/package/.gitignore b/package/.gitignore
new file mode 100644
index 0000000..192fb09
--- /dev/null
+++ b/package/.gitignore
@@ -0,0 +1 @@
+*.bz2
diff --git a/package/yast2-power-management.changes b/package/yast2-power-management.changes
index 59a760d..906ccb7 100644
--- a/package/yast2-power-management.changes
+++ b/package/yast2-power-management.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 19 14:26:53 UTC 2013 - lslezak@suse.cz
+
+- do not use *.spec.in template, use *.spec file with RPM macros
+  instead
+- 3.1.0
+
 -------------------------------------------------------------------
 Wed Jul 31 08:37:01 UTC 2013 - yast-devel@opensuse.org
 
diff --git a/package/yast2-power-management.spec b/package/yast2-power-management.spec
new file mode 100644
index 0000000..bfabf12
--- /dev/null
+++ b/package/yast2-power-management.spec
@@ -0,0 +1,64 @@
+#
+# spec file for package yast2-power-management
+#
+# 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-power-management
+Version:        3.1.0
+Release:        0
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source0:        %{name}-%{version}.tar.bz2
+
+Group:	        System/YaST
+License:        GPL-2.0
+BuildRequires:	update-desktop-files yast2-testsuite perl-XML-Writer yast2
+BuildRequires:  yast2-devtools >= 3.0.6
+Requires:	gettext
+BuildArchitectures: noarch
+
+# .etc.policykit agent
+Requires:	yast2 >= 2.14.7
+
+Requires:       yast2-ruby-bindings >= 1.0.0
+
+Summary:	YaST2 - Power Management Configuration
+
+%description
+This package contains the YaST2 component for Power management
+configuration.
+
+%prep
+%setup -n %{name}-%{version}
+
+%build
+%yast_build
+
+%install
+%yast_install
+
+
+%files
+%defattr(-,root,root)
+%dir %{yast_yncludedir}/power-management
+%{yast_yncludedir}/power-management/*
+%{yast_clientdir}/power-management.rb
+%{yast_clientdir}/power-management_*.rb
+%{yast_moduledir}/PowerManagement.*
+%{yast_desktopdir}/power-management.desktop
+%{yast_scrconfdir}/*
+%{yast_schemadir}/autoyast/rnc/power-management.rnc
+%doc %{yast_docdir}
diff --git a/src/.cvsignore b/src/.gitignore
similarity index 100%
rename from src/.cvsignore
rename to src/.gitignore
diff --git a/testsuite/.cvsignore b/testsuite/.gitignore
similarity index 100%
rename from testsuite/.cvsignore
rename to testsuite/.gitignore
diff --git a/testsuite/tests/.cvsignore b/testsuite/tests/.cvsignore
deleted file mode 100644
index e69de29..0000000
diff --git a/yast2-power-management.spec.in b/yast2-power-management.spec.in
deleted file mode 100644
index 48eb387..0000000
--- a/yast2-power-management.spec.in
+++ /dev/null
@@ -1,39 +0,0 @@
-@HEADER-COMMENT@
-
-@HEADER@
-Group:	System/YaST
-License: GPL-2.0
-BuildRequires:	update-desktop-files yast2-devtools yast2-testsuite perl-XML-Writer yast2
-Requires:	gettext
-BuildArchitectures: noarch
-
-# .etc.policykit agent
-Requires:	yast2 >= 2.14.7
-
-Requires:       yast2-ruby-bindings >= 1.0.0
-
-Summary:	YaST2 - Power Management Configuration
-
-%description
-This package contains the YaST2 component for Power management
-configuration.
-
-@PREP@
-
-@BUILD@
-
-@INSTALL@
-
-@CLEAN@
-
-%files
-%defattr(-,root,root)
-%dir @yncludedir@/power-management
-@yncludedir@/power-management/*
-@clientdir@/power-management.rb
-@clientdir@/power-management_*.rb
-@moduledir@/PowerManagement.*
-@desktopdir@/power-management.desktop
-@scrconfdir@/*
-@schemadir@/autoyast/rnc/power-management.rnc
-%doc @docdir@