diff -u'Nrpk~' pinentry-0.7.2~/Makefile.am pinentry-0.7.2/Makefile.am
--- pinentry-0.7.2~/Makefile.am	2004-12-22 13:48:43 +0300
+++ pinentry-0.7.2/Makefile.am	2005-06-22 15:06:43 +0400
@@ -53,7 +53,7 @@ else
 pinentry_w32 = 
 endif
 
-SUBDIRS = assuan secmem pinentry ${pinentry_curses} \
+SUBDIRS = secmem pinentry ${pinentry_curses} \
 	${pinentry_gtk} ${pinentry_gtk_2} ${pinentry_qt} ${pinentry_w32} doc
 
 signed-dist: $(distdir).tar.gz.sig
diff -u'Nrpk~' pinentry-0.7.2~/curses/Makefile.am pinentry-0.7.2/curses/Makefile.am
--- pinentry-0.7.2~/curses/Makefile.am	2003-12-23 11:41:40 +0300
+++ pinentry-0.7.2/curses/Makefile.am	2005-06-22 15:09:20 +0400
@@ -25,7 +25,7 @@ bin_PROGRAMS = pinentry-curses
 
 AM_CPPFLAGS = $(NCURSES_INCLUDE) -I$(top_srcdir)/pinentry
 LDADD = ../pinentry/libpinentry.a ../pinentry/libpinentry-curses.a \
-	../assuan/libassuan.a ../secmem/libsecmem.a \
+	-lassuan ../secmem/libsecmem.a \
 	$(LIBCAP) $(LIBCURSES) $(LIBICONV)
 
 pinentry_curses_SOURCES = pinentry-curses.c
diff -u'Nrpk~' pinentry-0.7.2~/gtk/Makefile.am pinentry-0.7.2/gtk/Makefile.am
--- pinentry-0.7.2~/gtk/Makefile.am	2003-12-23 11:41:40 +0300
+++ pinentry-0.7.2/gtk/Makefile.am	2005-06-22 15:09:08 +0400
@@ -33,7 +33,7 @@ endif
 
 AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(ncurses_include) \
 	-I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry
-LDADD = ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
+LDADD = ../pinentry/libpinentry.a -lassuan ../secmem/libsecmem.a \
 	$(LIBCAP) $(GTK_LIBS) $(libcurses)
 
 pinentry_gtk_SOURCES = pinentry-gtk.c \
diff -u'Nrpk~' pinentry-0.7.2~/gtk+-2/Makefile.am pinentry-0.7.2/gtk+-2/Makefile.am
--- pinentry-0.7.2~/gtk+-2/Makefile.am	2005-01-27 11:10:22 +0300
+++ pinentry-0.7.2/gtk+-2/Makefile.am	2005-06-22 15:08:58 +0400
@@ -31,7 +31,7 @@ endif
 
 AM_CPPFLAGS = $(GTK2CFLAGS) $(ncurses_include) \
 	-I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry
-LDADD = ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
+LDADD = ../pinentry/libpinentry.a -lassuan ../secmem/libsecmem.a \
 	$(LIBCAP) $(GTK2LIBS) $(libcurses)
 
 pinentry_gtk_2_SOURCES = pinentry-gtk-2.c \
diff -u'Nrpk~' pinentry-0.7.2~/pinentry/Makefile.am pinentry-0.7.2/pinentry/Makefile.am
--- pinentry-0.7.2~/pinentry/Makefile.am	2003-12-23 11:41:40 +0300
+++ pinentry-0.7.2/pinentry/Makefile.am	2005-06-22 15:09:29 +0400
@@ -29,7 +29,7 @@ endif
 
 noinst_LIBRARIES = libpinentry.a $(pinentry_curses)
 
-AM_CPPFLAGS = -I$(top_srcdir)/assuan -I$(top_srcdir)/secmem
+AM_CPPFLAGS = -I$(top_srcdir)/secmem
 
 libpinentry_a_SOURCES = pinentry.h pinentry.c
 libpinentry_curses_a_SOURCES = pinentry-curses.h pinentry-curses.c
diff -u'Nrpk~' pinentry-0.7.2~/pinentry/pinentry.c pinentry-0.7.2/pinentry/pinentry.c
--- pinentry-0.7.2~/pinentry/pinentry.c	2004-12-22 14:37:50 +0300
+++ pinentry-0.7.2/pinentry/pinentry.c	2005-06-22 15:10:22 +0400
@@ -37,7 +37,7 @@
 #include <iconv.h>
 #endif
 
-#include "assuan.h"
+#include <assuan.h>
 #include "memory.h"
 #include "secmem-util.h"
 #include "pinentry.h"
diff -u'Nrpk~' pinentry-0.7.2~/qt/Makefile.am pinentry-0.7.2/qt/Makefile.am
--- pinentry-0.7.2~/qt/Makefile.am	2004-09-21 22:58:02 +0400
+++ pinentry-0.7.2/qt/Makefile.am	2005-06-22 15:08:47 +0400
@@ -32,11 +32,11 @@ libcurses =
 endif
 
 
-AM_CPPFLAGS = -I$(top_srcdir)/assuan -I$(top_srcdir)/secmem $(QT_INCLUDES) $(ncurses_include) \
+AM_CPPFLAGS = -I$(top_srcdir)/secmem $(QT_INCLUDES) $(ncurses_include) \
 	-I$(top_srcdir)/pinentry
 AM_CXXFLAGS = $(QT_CXXFLAGS)
 pinentry_qt_LDADD = $(QT_LIBS) $(libcurses) ../pinentry/libpinentry.a \
-	$(top_builddir)/assuan/libassuan.a \
+	-lassuan \
 	$(top_builddir)/secmem/libsecmem.a $(LIBCAP)
 pinentry_qt_LDFLAGS = $(QT_LDFLAGS) $(QT_RPATH)
 
diff -u'Nrpk~' pinentry-0.7.2~/w32/Makefile.am pinentry-0.7.2/w32/Makefile.am
--- pinentry-0.7.2~/w32/Makefile.am	2004-12-22 17:26:59 +0300
+++ pinentry-0.7.2/w32/Makefile.am	2005-06-22 15:08:24 +0400
@@ -23,7 +23,7 @@ EXTRA_DIST = Manifest
 
 bin_PROGRAMS = pinentry-w32
 
-AM_CPPFLAGS = -I$(top_srcdir)/assuan -I$(top_srcdir)/secmem \
+AM_CPPFLAGS = -I$(top_srcdir)/secmem \
 	      -I$(top_srcdir)/pinentry
 
 
@@ -32,7 +32,7 @@ pinentry_w32_SOURCES = main.c pinentry-w
 
 pinentry_w32_LDFLAGS = -mwindows -mconsole
 pinentry_w32_LDADD = pinentry-w32.o \
-	../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a
+	../pinentry/libpinentry.a -lassuan ../secmem/libsecmem.a
 
 
 pinentry-w32.o: pinentry-w32.rc resource.h
--- pinentry-0.7.2/pinentry/pinentry.c~	2005-06-22 15:15:17 +0400
+++ pinentry-0.7.2/pinentry/pinentry.c	2005-06-22 17:13:34 +0400
@@ -657,8 +657,6 @@ register_commands (ASSUAN_CONTEXT ctx)
   for (i = j = 0; table[i].name; i++)
     {
       rc = assuan_register_command (ctx,
-                                    table[i].cmd_id ? table[i].cmd_id
-                                                   : (ASSUAN_CMD_USER + j++),
                                     table[i].name, table[i].handler);
       if (rc)
         return rc;