diff --git a/gpm.spec b/gpm.spec
index 7094788..3ab0369 100644
--- a/gpm.spec
+++ b/gpm.spec
@@ -1,7 +1,7 @@
 Summary: A mouse server for the Linux console
 Name: gpm
 Version: 1.20.6
-Release: 27%{?dist}
+Release: 28%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.nico.schottelius.org/software/gpm/
@@ -23,6 +23,7 @@ Requires(postun): systemd-units
 %define LIBVER 2.1.0
 BuildRequires: sed gawk texinfo bison ncurses-devel autoconf automake libtool libcap-ng-devel
 Requires: linuxconsoletools
+Requires: %{name}-libs = %{version}-%{release}
 
 %description
 Gpm provides mouse support to text-based Linux applications like the
@@ -41,6 +42,7 @@ the gpm system calls and library functions.
 
 %package devel
 Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 Summary: Development files for the gpm library
 Group: Development/Libraries
 
@@ -78,7 +80,7 @@ autoreconf
 
 %build
 %configure
-make %{?_smp_mflags}
+make CFLAGS="%{optflags}" %{?_smp_mflags}
 
 
 %install
@@ -105,6 +107,9 @@ rm -rf %{buildroot}%{_bindir}
 rm -rf %{buildroot}%{_mandir}
 %endif
 
+# UsrMove
+mv -f %{buildroot}/lib %{buildroot}/usr/
+
 %post
 %ifnarch s390 s390x
 %systemd_post gpm.service
@@ -146,7 +151,7 @@ fi
 %{_infodir}/*
 %ifnarch s390 s390x
 %config(noreplace) %{_sysconfdir}/gpm-*
-/lib/systemd/system/gpm.service
+/usr/lib/systemd/system/gpm.service
 %{_sbindir}/*
 %{_bindir}/*
 %{_mandir}/man?/*
@@ -163,6 +168,11 @@ fi
 %{_libdir}/libgpm.a
 
 %changelog
+* Wed Mar 06 2013 Jaromir Capik <jcapik@redhat.com> - 1.20.6-28
+- Adding missing requires
+- Passing OPTFLAGS to make
+- UsrMove
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.20.6-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild