diff --git a/net-snmp.spec b/net-snmp.spec
index de74e2f..52ccb68 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -3,7 +3,7 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
 Version: 5.2.1
-Release: 11
+Release: 12
 License: BSDish
 Group: System Environment/Daemons
 URL: http://net-snmp.sourceforge.net/
@@ -28,14 +28,15 @@ Patch9: net-snmp-5.2-64bit.diff
 #Patch10: net-snmp-5.1.1-ipAdEntIfIndex.patch
 Patch11: net-snmp-5.1.2-lelf.patch
 Patch12: net-snmp-5.1.2-dir-fix.patch
-#Patch13: net-snmp-5.2-ipsystemstats.patch
 Patch14: net-snmp-5.1.2-conf_list.patch
 Patch15: net-snmp-5.2.1-trim.patch
 Patch16: net-snmp-5.1.2-ASN-unsigned64.patch
 Patch17: net-snmp-5.2.1-typeclash.diff
-Patch18: net-snmp-5.1.2-agentx_register_callbacks_entry.patch
+#Patch18: net-snmp-5.1.2-agentx_register_callbacks_entry.patch
 Patch19: net-snmp-5.2.1-file_offset.patch
 Patch20: net-snmp-5.2.1-ethtool.patch
+Patch21: net-snmp-5.1.2-free_session.patch
+Patch22: net-snmp-5.2.1-clear_callback3.patch
 
 Prereq: /sbin/chkconfig
 Obsoletes: ucd-snmp
@@ -144,16 +145,17 @@ and applications.
 #%patch10 -p1 -b .ipAdEntIfIndex
 %patch11 -p1 -b .lelf
 %patch12 -p1 -b .dir-fix
-#%patch13 -p1 -b .ipstats
 %patch14 -p1 -b .conf_list
 
 # from CVS
 %patch15 -p1 -b .trim
 %patch16 -p1 -b .ASN-unsigned64
 %patch17 -b .typeclash
-%patch18 -p1 -b .reg_callbacks
+#%patch18 -p1 -b .reg_callbacks
 %patch19 -p1 -b .file_offset
 %patch20 -p1 -b .ethtool
+%patch21 -p1 -b .free_session
+%patch22 -p1 -b .callback3
 
 # Do this patch with a perl hack...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -164,7 +166,8 @@ export LDFLAGS="-L%{_libdir}"
 %endif
 %configure \
 	--enable-static --enable-shared			\
-	--with-cflags="$RPM_OPT_FLAGS -g"		\
+	--with-cflags="$RPM_OPT_FLAGS -lcrypto"		\
+	--with-ldflags="$LDFLAGS"			\
 	--with-sys-location="Unknown"			\
 	--with-logfile="/var/log/snmpd.log"		\
 	--with-persistent-directory="/var/net-snmp"	\
@@ -179,10 +182,10 @@ export LDFLAGS="-L%{_libdir}"
 	--sysconfdir=%{_sysconfdir}			\
 	--enable-ipv6					\
 	--enable-ucd-snmp-compatibility			\
+	--with-openssl					\
 	--with-pic					\
 	--with-sys-contact="root@localhost" <<EOF
 
-
 EOF
 
 make
@@ -331,6 +334,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/*.la
 
 %changelog
+* Wed May 18 2005 Radek Vokal <rvokal@redhat.com> - 5.2.1-12
+- session free fixed, agentx modules build fine (#157851)
+- fixed dependency for net-snmp libs (#156932)
+
 * Wed May 04 2005 Radek Vokal <rvokal@redhat.com> - 5.2.1-11
 - report gigabit Ethernet speeds using Ethtool (#152480)