diff --git a/ChangeLog b/ChangeLog
index d2c04ec5..3ac029f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2002-11-01  Jens Finke  <jens@triq.net>
+
+	Removed gnome-print dependency, this isn't supported
+	in the Gnome2 version yet.
+	
+	* configure.in: Removed libgnomeprint dependency. Updated required
+	library versions. Bumped version to 1.1.1.
+
+	* viewer/eog-image-view.c, 
+	* viewer/eog-util.c: Protected print related code with #if
+	GNOME2_PRINTING_WORKS.
+
+	* viewer/Makefile.am: Removed eog-print-setup.[ch] files from
+	SOURCES.
+
 2002-10-15  Irene Ryan <irene.ryan@sun.com>
 
 	* help/C/eog.xml: fix bug #91027
diff --git a/configure.in b/configure.in
index 35974a1b..020e42b1 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_INIT(shell/main.c)
 
 AM_CONFIG_HEADER(config.h)
 
-AM_INIT_AUTOMAKE(eog, 1.1.0)
+AM_INIT_AUTOMAKE(eog, 1.1.1)
 
 AM_MAINTAINER_MODE
 
@@ -12,12 +12,11 @@ GNOME_PLATFORM_GNOME_2(yes)
 
 dnl ================= Requirements ================================================
 
-GNOME_VFS_REQUIRED=1.9.12
-LIBGNOMEPRINT_REQUIRED=1.112.0
-LIBGNOMEUI_REQUIRED=1.115.0
-LIBBONOBOUI_REQUIRED=1.115.0
-BONOBO_ACTIVATION_REQUIRED=0.9.7
-LIBRSVG_REQUIRED=1.1.6
+GNOME_VFS_REQUIRED=2.0.4
+LIBGNOMEUI_REQUIRED=2.1.1
+LIBBONOBOUI_REQUIRED=2.0.3
+BONOBO_ACTIVATION_REQUIRED=1.0.3
+LIBRSVG_REQUIRED=2.0.1
 LIBGLADE_REQUIRED=2.0.1
 
 dnl ===============================================================================
@@ -144,7 +143,7 @@ dnl  AM_CONDITIONAL(ENABLE_GNOCAM, test x"$gnocam" = "xyes")
 gnocam=no
 AM_CONDITIONAL(ENABLE_GNOCAM, false)
 
-EOG_MODULES="gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libgnomeprint-2.0 >= $LIBGNOMEPRINT_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED librsvg-2.0 >= $LIBRSVG_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED"
+EOG_MODULES="gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED librsvg-2.0 >= $LIBRSVG_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED"
 PKG_CHECK_MODULES(EOG, $EOG_MODULES)
 AC_SUBST(EOG_CFLAGS)
 AC_SUBST(EOG_LIBS)
diff --git a/viewer/Makefile.am b/viewer/Makefile.am
index 02a32b05..243b5d8a 100644
--- a/viewer/Makefile.am
+++ b/viewer/Makefile.am
@@ -28,11 +28,11 @@ eog_image_viewer_SOURCES =	\
 	eog-preview.h		\
 	eog-preview-page.c	\
 	eog-preview-page.h	\
-	eog-print-setup.c	\
-	eog-print-setup.h	\
 	eog-util.h		\
 	eog-util.c		\
 	main.c
+#	 eog-print-setup.c	\
+#	 eog-print-setup.h	\
 #	 eog-embeddable.c	\
 #	 eog-embeddable.h	\
 #	 eog-embeddable-view.c	\
diff --git a/viewer/eog-image-view.c b/viewer/eog-image-view.c
index 01078f8e..91cf378d 100644
--- a/viewer/eog-image-view.c
+++ b/viewer/eog-image-view.c
@@ -23,11 +23,15 @@
 #include <gtk/gtktypeutils.h>
 #include <gconf/gconf-client.h>
 
+#if GNOME2_PRINTING_WORKS
 #include <libgnomeprint/gnome-print-master.h>
 #include <libgnomeprint/gnome-print.h>
+#endif 
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
 
+#if GNOME2_PRINTING_WORKS
 #include <eog-print-setup.h>
+#endif
 #include <eog-image-view.h>
 #include <eog-full-screen.h>
 #include <image-view.h>
@@ -582,7 +586,8 @@ verb_Send_cb (BonoboUIComponent *uic, gpointer user_data, const char *name)
  * Start of printing related code 
  * ***************************************************************************/
 
-#if 0 
+#if GNOME2_PRINTING_WORKS
+/* FIXME GNOME2: make printing work! */
 static gint
 count_pages (gdouble 	paper_width,
 	     gdouble	paper_height,
@@ -621,7 +626,6 @@ count_pages (gdouble 	paper_width,
 
 	return (cols * rows);
 }
-#endif
 
 static void
 print_line (GnomePrintContext *context, 
@@ -911,8 +915,6 @@ eog_image_view_print (EogImageView *image_view, gboolean preview,
 		      gint adjust_to, gdouble overlap_x, gdouble overlap_y,
 		      gboolean overlap)
 {
-#if 0 
-/* FIXME GNOME2: make printing work! */
 	GdkPixbuf	  *pixbuf;
 	GdkPixbuf	  *pixbuf_orig;
 	GdkInterpType	   interp;
@@ -1054,7 +1056,6 @@ eog_image_view_print (EogImageView *image_view, gboolean preview,
 	}
 
 	gtk_object_unref (GTK_OBJECT (print_master));
-#endif /* FIXME GNOME2: make printing work */
 }
 
 static void
@@ -1129,6 +1130,7 @@ verb_PrintSetup_cb (BonoboUIComponent *uic, gpointer user_data,
 	print_setup = eog_print_setup_new (image_view);
 	gtk_widget_show (print_setup);
 }
+#endif /* printing does not work */
 
 
 #define EVOLUTION_MENU "<menuitem name=\"Send\" _label=\"Send\" pixtype=\"stock\" pixname=\"New Mail\" verb=\"\"/>"
@@ -1180,12 +1182,15 @@ eog_image_view_create_ui (EogImageView *image_view)
 	bonobo_ui_component_add_verb (image_view->priv->uic, "AcquireFromCamera",
 				      verb_AcquireFromCamera_cb, image_view);
 #endif
+
+#if GNOME2_PRINTING_WORKS
 	bonobo_ui_component_add_verb (image_view->priv->uic, "PrintSetup", 
 				      verb_PrintSetup_cb, image_view);
 	bonobo_ui_component_add_verb (image_view->priv->uic, "PrintPreview",
 				      verb_PrintPreview_cb, image_view);
 	bonobo_ui_component_add_verb (image_view->priv->uic, "Print",
 				      verb_Print_cb, image_view);
+#endif
 }
 
 /* ***************************************************************************
diff --git a/viewer/eog-util.c b/viewer/eog-util.c
index a99f23dc..fcceee16 100644
--- a/viewer/eog-util.c
+++ b/viewer/eog-util.c
@@ -9,7 +9,10 @@
  */
 
 #include <eog-util.h>
+
+#if GNOME2_PRINTING_WORKS
 #include <libgnomeprint/gnome-print-paper.h>
+#endif
 
 GSList *
 eog_util_split_string (const gchar *string, const gchar *delimiter)
@@ -62,6 +65,7 @@ eog_util_split_string (const gchar *string, const gchar *delimiter)
 	return list;
 }
 
+#if GNOME2_PRINTING_WORKS
 void
 eog_util_load_print_settings (GConfClient *client,
 			      gchar **paper_size, gdouble *top, 
@@ -125,3 +129,4 @@ eog_util_paper_size (const gchar *paper_size, gboolean landscape,
 		*height = paper->height;
 	}
 } 
+#endif