diff --git a/debian/README.Debian b/debian/README.Debian
index d633324..cf1c13a 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -6,11 +6,13 @@
 
 GStreamer core is split into the following packages:
 
-   libgst2              shared core libs
-   libgst-dev           development libs and headers
-   gstreamer-runtime    tools required by the libs (gstreamer-register)
-   gstreamer-doc        documentation
-   gstreamer-tools      useful tools
-   gstreamer-core       core plugins and lib plugins
+   libgst2                 shared core libs
+   libgst-dev              development libs and headers
+   gstreamer-runtime       tools required by the libs (gstreamer-register)
+   gstreamer-doc           documentation
+   gstreamer-tools         useful tools
+   gstreamer-core          core plugins
+   gstreamer-lib-core      core lib plugins
+   gstreamer-lib-core-dev  development files for core lib plugins
 
 David I. Lehn <dlehn@vt.edu>  Fri, 19 Jan 2001 19:13:06 -0500
diff --git a/debian/changelog b/debian/changelog
index 239fabb..9a43f87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,10 @@
   * Moved gstreamer-guilaunch to gst-editor source package
   * Removed gstreamer-config and .m4 in favor of pkg-config use
   * Build for glib2
+  * Change doc build system a bit
+  * Added -lib-core and -lib-core-dev packages for library plugins
 
- -- David I. Lehn <dlehn@vt.edu>  Tue,  8 Jan 2002 17:57:13 -0500
+ -- David I. Lehn <dlehn@vt.edu>  Thu, 10 Jan 2002 23:09:34 -0500
 
 gstreamer (0.3.0-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index dc66836..05b6287 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: David I. Lehn <dlehn@vt.edu>
-Build-Depends: debhelper (>= 3.0.0), libxml-dev (>= 1.8.10), zlib1g-dev (>= 1:1.1.3), libghttp-dev (>= 1.0.6), libglib1.2-dev (>= 1.2.8), libgtk1.2-dev (>= 1.2.8), libglade0-dev (>= 0.14), libglade-gnome0-dev (>= 0.14), hermes1-dev (>= 1.3.1), pkg-config (>= 0.8.0)
+Build-Depends: debhelper (>= 3.0.0), libxml2-dev (>= 2.4.12), zlib1g-dev (>= 1:1.1.3), libglib1.3-dev (>= 1.3.12), libgtk1.3-dev (>= 1.3.12), pkg-config (>= 0.8.0)
 Build-Depends-Indep: debhelper (>= 3.0.0), gtk-doc-tools (>= 0.4), jade (>= 1.2.1), transfig (>= 3.2.3.c), docbook-utils (>= 0.6.9), xsltproc (>= 1.0.6)
 Standards-Version: 3.5.6
 
@@ -37,6 +37,10 @@
 Recommends: libgst-dev (= ${Source-Version})
 Description: Core GStreamer documentation
  Core GStreamer documentation
+ .
+ Gstreamer Manual
+ Gstreamer Plugin Writers Guide
+ Various API docs
 
 Package: gstreamer-tools
 Architecture: any
@@ -58,22 +62,33 @@
  Core element and library plugins for GStreamer
  .
  Includes various basic elements:
- * file source and sink
- * tee and aggregator
- * fake source and sink for testing
- * identity
- * pipe filter
- * statistics
+  * file source and sink
+  * tee and aggregator
+  * fake source and sink for testing
+  * identity
+  * pipe filter
+  * statistics
  .
  And other important yet plugable pieces:
- * autoplugging support
- * standard scheduler
- * type detection support
- .
- Some library plugins:
- * bytestream
- * control
- * putbits
- * getbits
- .
- These plugins have no external dependencies.
+  * autoplugging support
+  * standard scheduler
+  * type detection support
+
+Package: gstreamer-lib-core
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description: Core library plugins for GStreamer
+ Core library plugins for GStreamer
+  * bytestream
+  * control
+  * putbits
+  * getbits
+
+Package: gstreamer-lib-core-dev
+Architecture: any
+Section: devel
+Depends: gstreamer-lib-core
+Description: Development files for core library plugins for GStreamer
+ Development files for core library plugins for GStreamer
+ Includes headers for library plugins from gstreamer-lib-core
diff --git a/debian/gstreamer-lib-core-dev.files b/debian/gstreamer-lib-core-dev.files
new file mode 100644
index 0000000..c5f6145
--- /dev/null
+++ b/debian/gstreamer-lib-core-dev.files
@@ -0,0 +1,4 @@
+usr/include/gst/bytestream
+usr/include/gst/control
+usr/include/gst/getbits
+usr/include/gst/putbits
diff --git a/debian/gstreamer-lib-core.files b/debian/gstreamer-lib-core.files
new file mode 100644
index 0000000..1ff944f
--- /dev/null
+++ b/debian/gstreamer-lib-core.files
@@ -0,0 +1,4 @@
+usr/lib/gst/libgstbytestream.*
+usr/lib/gst/libgstcontrol.*
+usr/lib/gst/libgstgetbits.*
+usr/lib/gst/libgstputbits.*
diff --git a/debian/libgst-dev.files b/debian/libgst-dev.files
index 13506b0..20b96c1 100644
--- a/debian/libgst-dev.files
+++ b/debian/libgst-dev.files
@@ -1,5 +1,3 @@
-usr/include
+usr/include/gst/*.h
 usr/lib/pkgconfig
-usr/lib/libgst.a
-usr/lib/libgst.la
-usr/lib/libgst.so
+usr/lib/libgst.{a,la,so}
diff --git a/debian/rules b/debian/rules
index 0167ad9..ca937a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,11 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
+
+	# make sure we're using a ltmain.sh that can handle relinking
+	# in case autogen.sh (and libtoolize) was run
+	cp ltmain-fixed.sh ltmain.sh
+
 	# Add here commands to configure the package.
 	./configure \
 		--build=$(DEB_BUILD_GNU_TYPE) \
@@ -25,14 +30,14 @@
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
+		--with-html-dir=\$${prefix}/share/doc/gstreamer-doc \
 		--sysconfdir=/etc \
 		--with-configdir=/etc/gstreamer \
-		--with-win32-libdir=/usr/lib/win32 \
 		--enable-glib2 \
 		--disable-plugin-builddir \
 		--disable-tests \
 		--disable-examples \
-		--disable-docs-build \
+		--enable-docs-build \
 		--disable-plugin-docs \
 		--enable-DEBUG \
 		--enable-debug
@@ -48,6 +53,8 @@
 	dh_testdir
 
 	# Add here commands to compile the package.
+	# FIXME missing upstream, diff doesn't include these 0 byte files:
+	touch docs/fwg/base.css docs/manual/base.css
 	$(MAKE)
 
 	touch build-stamp
@@ -64,14 +71,7 @@
 	dh_clean
 
 	# FIXME some extra clean up
-	rm -rf \
-		debian/gstreamer \
-		docs/gst/gstreamer-scan.o \
-		docs/gst/gstreamer-decl-list.txt \
-		docs/gst/gstreamer-decl.txt \
-		docs/gst/gstreamer.html \
-		docs/libs/tmpl \
-		docs/plugins/gstreamer-plugins.types
+	rm -rf debian/gstreamer
 	find . -name \*.stamp | xargs rm || true
 	find . -name Makefile | grep -v omega | xargs rm || true
 
@@ -87,12 +87,15 @@
 	$(MAKE) prefix=$(CURDIR)/debian/gstreamer/usr install
 
 	# move around the doc dirs
-	mkdir -p debian/gstreamer/usr/share/doc/gstreamer-doc/html
-	-mv debian/gstreamer/usr/share/gstreamer/gst-plugin-writers-guide \
-	   debian/gstreamer/usr/share/gstreamer/gstreamer-manual \
-	   debian/gstreamer/usr/share/gstreamer/html/gstreamer-libs \
-	   debian/gstreamer/usr/share/gst/html/gstreamer \
-	   debian/gstreamer/usr/share/doc/gstreamer-doc/html
+	mkdir -p debian/gstreamer/usr/share/doc/gstreamer-doc
+	#-mv debian/gstreamer/usr/share/gstreamer/gst-plugin-writers-guide \
+	#   debian/gstreamer/usr/share/gstreamer/gstreamer-manual \
+	#   debian/gstreamer/usr/share/gstreamer/html/gstreamer-libs \
+	#   debian/gstreamer/usr/share/gst/html/gstreamer \
+	#   debian/gstreamer/usr/share/doc/gstreamer-doc
+	-cp -r docs/fwg/gst-plugin-writers-guide \
+	   docs/manual/gstreamer-manual \
+	   debian/gstreamer/usr/share/doc/gstreamer-doc
 
 	dh_movefiles --sourcedir=debian/gstreamer