diff --git a/sqlite2.spec b/sqlite2.spec
index 708dd5a..32c90fc 100644
--- a/sqlite2.spec
+++ b/sqlite2.spec
@@ -1,6 +1,8 @@
+%define tclver 8.5
+
 Name:           sqlite2
 Version:        2.8.17
-Release:        3%{?dist}
+Release:        5%{?dist}
 
 Summary:        Embeddable SQL engine in a C library
 Group:          System Environment/Libraries
@@ -44,7 +46,7 @@ applications using sqlite.
 %package        tcl
 Summary:        Tcl bindings for sqlite
 Group:          System Environment/Libraries
-Requires:       tcl >= 8.3.3, %{name} = %{version}-%{release}
+Requires:       tcl >= %{tclver}, %{name} = %{version}-%{release}
 Obsoletes:      sqlite-tcl < 3
 
 %description    tcl
@@ -85,6 +87,8 @@ echo 'package ifneeded sqlite 2 [list load [file join $dir libtclsqlite.so]]' > 
 
 %makeinstall
 install -D -m 0644 sqlite.1 $RPM_BUILD_ROOT%{_mandir}/man1/sqlite.1
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/tcl%{tclver}
+mv $DIRECTORY $RPM_BUILD_ROOT%{_libdir}/tcl%{tclver}/sqlite2
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
@@ -111,9 +115,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc doc/tclsqlite.html
 %exclude %{_bindir}/tclsqlite
-%{_libdir}/sqlite-%version
+%{_libdir}/tcl%{tclver}/sqlite2
 
 %changelog
+* Tue Aug 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.8.17-5
+- Install tcl subpackage in correct place, thanks to hkoba for patch (#516411)
+- Use new tclver define, depend on at least tcl 8.5
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.17-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Mar 23 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.8.17-3
 - Add patches to build with new TCL and fix tests (#491726)
   thanks to D. Marlin.