diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..ceb5b1d
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2001-2012 OFFIS, Tammo Freese, Henri Tremblay.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/easymock.spec b/easymock.spec
index 3def2e1..4bfc4c7 100644
--- a/easymock.spec
+++ b/easymock.spec
@@ -30,7 +30,7 @@
 
 Name:           easymock
 Version:        1.2
-Release:        16%{?dist}
+Release:        17%{?dist}
 Epoch:          0
 Summary:        Easy mock objects
 Group:          Development/Libraries
@@ -42,11 +42,13 @@ URL:            http://www.easymock.org/
 Source0:        easymock-1.2-src.tar.gz
 Source1:        http://repo1.maven.org/maven2/easymock/easymock/1.2_Java1.5/easymock-1.2_Java1.5.pom
 Source2:        easymock-component-info.xml
+# Starting with version 2.5.1, EasyMock changed its license to Apache 2.
+# Older versions are still available under MIT License
+# See http://www.easymock.org/License.html
+Source3:        LICENSE
 Patch0:         easymock-1.2-build_xml.patch
 Patch1:         %{name}-removed-test.patch
 Patch2:         %{name}-removed-alltests.patch
-Requires(post): jpackage-utils >= 1.7.2
-Requires(postun): jpackage-utils >= 1.7.2
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-junit >= 0:1.6
@@ -72,6 +74,7 @@ Javadoc for %{name}.
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
+cp %{SOURCE3} .
 mkdir lib
 pushd lib
 ln -sf $(build-classpath junit) .
@@ -103,31 +106,26 @@ cp -pr %{name}%{version}_Java1.3/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 # pom
 install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap easymock easymock %{version}_Java1.5 JPP easymock
+%add_maven_depmap
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%pre javadoc
-# workaround for rpm bug 646523 (can be removed in F-17)
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %files
-%defattr(-,root,root,-)
+%doc LICENSE
 %doc %{name}%{version}_Java1.3/{Documentation,License}.html
 %{_mavenpomdir}*
 %{_mavendepmapfragdir}/*
 %{_javadir}/%{name}.jar
 
 %files javadoc
-%defattr(-,root,root,-)
+%doc LICENSE
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 16 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.2-17
+- Add LICENSE file
+- Remove rpm bug workaround
+- Update to current packaging guidelines
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild