Index: b/gtk+-2/Makefile.am
===================================================================
--- b/gtk+-2/Makefile.am
+++ b/gtk+-2/Makefile.am
@@ -34,5 +34,5 @@
 LDADD = ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
 	$(COMMON_LIBS) $(LIBCAP) $(GTK2LIBS) $(libcurses)
 
-pinentry_gtk_2_SOURCES = pinentry-gtk-2.c \
-	gtksecentry.c gtksecentry.h gseal-gtk-compat.h
+pinentry_gtk_2_SOURCES = pinentry-gtk-2.c
+#	gtksecentry.c gtksecentry.h gseal-gtk-compat.h
Index: b/gtk+-2/pinentry-gtk-2.c
===================================================================
--- b/gtk+-2/pinentry-gtk-2.c
+++ b/gtk+-2/pinentry-gtk-2.c
@@ -59,6 +59,15 @@
 #  define VERSION
 #endif
 
+#define GTK_SIMPLE_ENTRY
+#ifdef GTK_SIMPLE_ENTRY
+# undef GTK_SECURE_ENTRY
+# define GTK_SECURE_ENTRY GTK_ENTRY
+# define gtk_secure_entry_get_text gtk_entry_get_text
+# define gtk_secure_entry_set_text gtk_entry_set_text
+# define gtk_secure_entry_new gtk_entry_new
+#endif
+
 static pinentry_t pinentry;
 static int grab_failed;
 static int passphrase_ok;
@@ -630,9 +639,11 @@
 			G_CALLBACK (button_clicked), "ok");
       GTK_WIDGET_SET_FLAGS (w, GTK_CAN_DEFAULT);
       gtk_widget_grab_default (w);
+#ifndef GTK_SIMPLE_ENTRY
       g_signal_connect_object (G_OBJECT (entry), "focus_in_event",
 				G_CALLBACK (gtk_widget_grab_default),
 			       G_OBJECT (w), 0);
+#endif
     }
   else
     {
@@ -699,6 +710,7 @@
 int
 main (int argc, char *argv[])
 {
+#ifndef GTK_SIMPLE_ENTRY
   static GMemVTable secure_mem =
     {
       secentry_malloc,
@@ -710,6 +722,7 @@
     };
 
   g_mem_set_vtable (&secure_mem);
+#endif
 
   pinentry_init (PGMNAME);