diff --git a/install/debian/control.in b/install/debian/control.in
index b8370e90b0..2e2b5c874f 100644
--- a/install/debian/control.in
+++ b/install/debian/control.in
@@ -18,6 +18,19 @@ Description: Free Pascal -- Compiler
  command line compiler. You need at least the RTL package before you can start
  compiling anything.
 
+Package: fp-ide
+Architecture: i386 powerpc sparc amd64
+Depends: fp-units-rtl (= %{packageversion})
+Suggests: fp-utils, fp-docs (>= %{fpcversion})
+Description: Free Pascal -- IDE
+ The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32-bit
+ Pascal Compiler. It comes with a fully compatible TP 7.0 runtime library.
+ Some extensions are added to the language, like function overloading. Shared
+ libraries can be linked and created. Basic Delphi support is already
+ implemented (classes, exceptions, ansistrings). This package contains the
+ Integrated Development Environment (IDE). The IDE has an internal compiler.
+ You need at least the RTL package before you can start  compiling anything.
+
 Package: fp-utils
 Architecture: i386 powerpc sparc amd64
 Recommends: fp-compiler (= %{packageversion})
@@ -125,8 +138,8 @@ Description: Free Pascal -- networking units
  The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32-bit
  Pascal Compiler. It comes with a fully compatible TP 7.0 runtime library.
  This package contains Free Pascal units for creating network tools:
-  - Inet unit for easier TCP/IP handling
-  - UnCGI unit for easy CGI handling
+  - NetDB unit for TCP/IP handling
+  - LibAsync unit for easy Asynchronous IO
 
 Package: fp-units-misc
 Architecture: i386 powerpc sparc amd64
diff --git a/install/debian/fp-ide.install.in b/install/debian/fp-ide.install.in
new file mode 100644
index 0000000000..750985d604
--- /dev/null
+++ b/install/debian/fp-ide.install.in
@@ -0,0 +1,4 @@
+/usr/bin/fp
+/usr/lib/fpc/%{fpcversion}/ide
+/usr/share/doc/fp-ide
+
diff --git a/install/debian/moveexamples b/install/debian/moveexamples
index 27324c7efa..e1892b363f 100644
--- a/install/debian/moveexamples
+++ b/install/debian/moveexamples
@@ -7,6 +7,9 @@ DOC_DIR=$2
 
 move_examples()
 {
+    # Make examples dir
+    install -d -m 755 $DOC_DIR/fp-units-$1/examples/
+    
     for package in $2; do
         if [ -d $EXAMPLE_TEMP/$package/examples ]; then
             echo "Moving examples of $package"
@@ -21,6 +24,7 @@ move_examples()
 
 
 FCL_PACKAGES="fcl"
+FV_PACKAGES="fv"
 GTK_PACKAGES="gtk"
 GNOME1_PACKAGES="imlib zvt gnome gconf"
 BASE_PACKAGES="paszlib pasjpeg regexpr ncurses md5"
@@ -30,6 +34,7 @@ MISC_PACKAGES="gdbint utmp syslog cdrom tcl"
 NET_PACKAGES="netdb"
 
 move_examples fcl "$FCL_PACKAGES"
+move_examples fv "$FV_PACKAGES"
 move_examples gtk "$GTK_PACKAGES"
 move_examples gnome1 "$GNOME1_PACKAGES"
 move_examples base "$BASE_PACKAGES"
diff --git a/install/debian/rules b/install/debian/rules
index 62632651d8..95914d0030 100644
--- a/install/debian/rules
+++ b/install/debian/rules
@@ -79,6 +79,8 @@ clean:
 	$(MAKE) rtl_distclean
 	$(MAKE) packages_distclean
 	$(MAKE) fcl_distclean
+	$(MAKE) fv_distclean
+	$(MAKE) ide_distclean
 	$(MAKE) utils_distclean
 
 	$(MAKE) -C docs clean
@@ -117,7 +119,9 @@ build-arch-stamp: debian-files-stamp
 	$(MAKE) rtl_clean rtl_smart $(BUILDOPTS)
 	$(MAKE) packages_base_smart $(BUILDOPTS)
 	$(MAKE) fcl_smart $(BUILDOPTS)
+	$(MAKE) fv_smart $(BUILDOPTS)
 	$(MAKE) packages_extra_smart $(BUILDOPTS)
+	$(MAKE) ide_all $(BUILDOPTS)
 	$(MAKE) utils_all $(BUILDOPTS)
 
 	touch build-arch-stamp
@@ -134,19 +138,12 @@ install-arch-stamp: build-arch-stamp debian-files-stamp
 	$(MAKE) compiler_distinstall $(INSTALLOPTS)
 	$(MAKE) rtl_distinstall $(INSTALLOPTS)
 	$(MAKE) fcl_distinstall $(INSTALLOPTS)
+	$(MAKE) fv_distinstall $(INSTALLOPTS)
 	$(MAKE) packages_distinstall $(INSTALLOPTS)
+	$(MAKE) ide_distinstall $(INSTALLOPTS) INSTALL_DOCDIR=$(DOC_DIR)/fp-ide
 	$(MAKE) utils_distinstall $(INSTALLOPTS)
 
 # Copy examples to the correct doc dir
-	install -d -m755 $(DOC_DIR)/fp-units-fcl/examples
-	install -d -m755 $(DOC_DIR)/fp-units-gtk/examples
-	install -d -m755 $(DOC_DIR)/fp-units-gnome1/examples
-	install -d -m755 $(DOC_DIR)/fp-units-gfx/examples
-	install -d -m755 $(DOC_DIR)/fp-units-db/examples
-	install -d -m755 $(DOC_DIR)/fp-units-net/examples
-	install -d -m755 $(DOC_DIR)/fp-units-misc/examples
-	install -d -m755 $(DOC_DIR)/fp-units-base/examples
-
 	bash debian/moveexamples $(EXAMPLE_TEMP) $(DOC_DIR)
 
 # Install man pages and RTL demos and whatsnew and readme