diff --git a/net-snmp.spec b/net-snmp.spec
index fe36359..958d3775 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -7,7 +7,7 @@
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: %{major_ver}
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 
 License: BSD and CMU
@@ -118,7 +118,21 @@ BuildRequires: perl >= 5
 The net-snmp-perl package contains the perl files to use SNMP from within
 Perl.
 
-Install the net-snmp-perl package, if you want to use mib2c or SNMP with perl.
+Install the net-snmp-perl package, if you want to use mib2c or SNMP 
+with perl.
+
+%package tkmib
+Group: Applications/System
+Summary: An interactive graphical MIB browser for SNMP
+Requires: perl-Tk, net-snmp-perl
+
+%description tkmib
+The net-snmp-tkmib package contains tkmib utility. tkmib is a graphical user 
+interface for browsing the Message Information Bases (MIBs). It is also 
+capable of sending or retrieving the SNMP management information to/from 
+the remote agents interactively.
+
+Install the net-snmp-tkmib package, if you want to use this interactive utility.
 
 %package libs
 Group: Development/Libraries
@@ -241,7 +255,6 @@ install -d ${RPM_BUILD_ROOT}%{_bindir}
 install -m 755 %SOURCE5 ${RPM_BUILD_ROOT}%{_bindir}/ucd5820stat
 
 rm -f ${RPM_BUILD_ROOT}%{_bindir}/snmpinform
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/tkmib
 rm -f ${RPM_BUILD_ROOT}%{_bindir}/snmpcheck
 rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/snmpconf.1*
 ln -s snmptrap ${RPM_BUILD_ROOT}/usr/bin/snmpinform
@@ -329,9 +342,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/encode_keychange
 %{_bindir}/snmp*
 %{_bindir}/traptoemail
-%{_bindir}/mib2c-update
 %attr(0644,root,root)	%{_mandir}/man1/snmp*.1*
-%attr(0644,root,root)	%{_mandir}/man1/mib2c-update*.1*
 %attr(0644,root,root)	%{_mandir}/man1/traptoemail*.1*
 %attr(0644,root,root)	%{_mandir}/man1/encode_keychange*.1*
 %attr(0644,root,root)	%{_mandir}/man1/fixproc*.1*
@@ -348,16 +359,27 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files perl -f perl.lst
 %defattr(-,root,root)
+%{_bindir}/mib2c-update
 %{_bindir}/mib2c
+%attr(0644,root,root)	%{_mandir}/man1/mib2c-update*.1*
 %attr(0644,root,root)	%{_mandir}/man1/mib2c.1*
-%attr(0644,root,root)	%{_mandir}/man1/tkmib.1*
 %attr(0644,root,root)   %{_mandir}/man3/*.3pm.*
 
+%files tkmib
+%defattr(-,root,root)
+%{_bindir}/tkmib
+%attr(0644,root,root)	%{_mandir}/man1/tkmib.1*
+
 %files libs
 %defattr(-,root,root)
 %{_libdir}/lib*.so.*
 
 %changelog
+* Fri Oct 19 2007 Jan Safranek <jsafranek@redhat.com> 5.4.1-5
+- move mib2c-update from net-snmp-utils to net-snmp-perl, where
+  mib2c is located
+- add tkmib to net-snmp-tkmib package (#167933)
+
 * Tue Oct 16 2007 Jan Safranek <jsafranek@redhat.com> 5.4.1-4
 - License: field fixed to "BSD and CMU"