diff --git a/tuna.spec b/tuna.spec
index b4daf7a..e658255 100644
--- a/tuna.spec
+++ b/tuna.spec
@@ -12,7 +12,7 @@ URL: http://userweb.kernel.org/~acme/tuna/
 BuildArch: noarch
 BuildRequires: python-devel, gettext
 Requires: python-ethtool
-Requires: python-linux-procfs >= 0.4.6
+Requires: python-linux-procfs >= 0.4.5
 Requires: python-schedutils >= 0.2
 # This really should be a Suggests...
 # Requires: python-inet_diag
@@ -31,7 +31,7 @@ installed.
 Summary: Generic graphical signal plotting tool
 Group: Applications/System
 Requires: python-matplotlib
-Requires: python-numeric
+Requires: numpy
 Requires: pygtk2
 Requires: tuna = %{version}-%{release}
 
@@ -52,11 +52,15 @@ priority is changed, be it using tuna or plain chrt & taskset.
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install --skip-build --root %{buildroot}
-mkdir -p %{buildroot}/{%{_bindir},%{_datadir}/tuna/help/kthreads}
+mkdir -p %{buildroot}/%{_sysconfdir}/tuna/
+mkdir -p %{buildroot}/{%{_bindir},%{_datadir}/tuna/help/kthreads,%{_mandir}/man8}
 install -p -m644 tuna/tuna_gui.glade %{buildroot}/%{_datadir}/tuna/
 install -p -m755 tuna-cmd.py %{buildroot}/%{_bindir}/tuna
 install -p -m755 oscilloscope-cmd.py %{buildroot}/%{_bindir}/oscilloscope
 install -p -m644 help/kthreads/* %{buildroot}/%{_datadir}/tuna/help/kthreads/
+install -p -m644 docs/tuna.8 %{buildroot}/%{_mandir}/man8/
+install -p -m644 etc/tuna/example.conf %{buildroot}/%{_sysconfdir}/tuna/
+install -p -m644 etc/tuna.conf %{buildroot}/%{_sysconfdir}/
 
 # l10n-ed message catalogues
 for lng in `cat po/LINGUAS`; do
@@ -79,6 +83,9 @@ rm -rf %{buildroot}
 %{_bindir}/tuna
 %{_datadir}/tuna/
 %{python_sitelib}/tuna/
+%{_mandir}/man8/tuna.8*
+%{_sysconfdir}/tuna.conf
+%{_sysconfdir}/tuna/*
 
 %files -n oscilloscope
 %defattr(-,root,root,-)
@@ -87,6 +94,10 @@ rm -rf %{buildroot}
 %doc docs/oscilloscope+tuna.pdf
 
 %changelog
+* Tue Jun 11 2013 Jiri Kastner <jkastner@redhat.com> - 0.11-2
+- changed dependencies from python-numeric to numpy
+- merged spec changes from upstream
+
 * Thu Jun  6 2013 Jiri Kastner <jkastner@redhat.com> - 0.11-1
 - New upstream release