--- mc/src/Makefile.am.orig	2008-03-29 21:52:19 +0500
+++ mc/src/Makefile.am	2008-03-29 22:18:43 +0500
@@ -38,7 +38,7 @@ VFSLIB = ../vfs/libvfs-mc.a
 endif
 endif
 
-mc_LDADD = $(EDITLIB) $(SLANGLIB) $(VFSLIB) \
+mc_LDADD = -lpopt $(EDITLIB) $(SLANGLIB) $(VFSLIB) \
 	$(INTLLIBS) $(GLIB_LIBS) $(MCLIBS) $(LIBICONV)
 
 CHARSET_SRC = charsets.c charsets.h selcodepage.c selcodepage.h
@@ -56,8 +56,7 @@ SRCS =	achown.c achown.h background.c ba
 	logging.h logging.c						\
 	main.c main.h							\
 	menu.c menu.h mountlist.c mountlist.h mouse.c mouse.h myslang.h	\
-	option.c option.h panel.h panelize.c panelize.h poptalloca.h	\
-	popt.c poptconfig.c popt.h popthelp.c poptint.h poptparse.c	\
+	option.c option.h panel.h panelize.c panelize.h 		\
 	profile.c profile.h regex.c rxvt.c screen.c setup.c setup.h	\
 	slint.c	subshell.c subshell.h textconf.c textconf.h		\
 	tree.c tree.h treestore.c treestore.h tty.c tty.h user.c user.h	\
--- mc/src/findme.c.orig	2008-03-29 22:12:45 +0500
+++ mc/src/findme.c	2008-03-29 22:18:43 +0500
@@ -4,8 +4,6 @@
 
 #include <config.h>
 
-#include "poptalloca.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
--- mc/src/main.c.orig	2008-03-29 22:20:12 +0500
+++ mc/src/main.c	2008-03-29 22:20:55 +0500
@@ -87,7 +87,7 @@
 #include "../vfs/gc.h"
 #endif
 
-#include "popt.h"
+#include <popt.h>
 
 /* When the modes are active, left_panel, right_panel and tree_panel */
 /* Point to a proper data structure.  You should check with the functions */
@@ -1848,14 +1848,12 @@ init_sigchld (void)
 static void
 print_mc_usage (poptContext ctx, FILE *stream)
 {
-    int leftColWidth;
-
     poptSetOtherOptionHelp (ctx,
 			    _("[flags] [this_dir] [other_panel_dir]\n"));
 
     /* print help for options */
-    leftColWidth = poptPrintHelp (ctx, stream, 0);
-    fprintf (stream, "  %-*s   %s\n", leftColWidth, _("+number"),
+    poptPrintHelp (ctx, stream, 0);
+    fprintf (stream, "  %-*s   %s\n", 0, _("+number"),
 	     _("Set initial line number for the internal editor"));
     fputs (_
 	   ("\n"