diff -urN augeas-0.5.1/examples/fadot.c augeas-0.5.1.new/examples/fadot.c
--- augeas-0.5.1/examples/fadot.c	2009-04-07 21:37:29.000000000 +0200
+++ augeas-0.5.1.new/examples/fadot.c	2009-06-19 11:33:39.000000000 +0200
@@ -28,7 +28,6 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <string.h>
-#include <getopt.h>
 #include <stdlib.h>
 
 #include "fa.h"
diff -urN augeas-0.5.1/src/Makefile.in augeas-0.5.1.new/src/Makefile.in
--- augeas-0.5.1/src/Makefile.in	2009-06-10 01:20:04.000000000 +0200
+++ augeas-0.5.1.new/src/Makefile.in	2009-06-19 11:31:33.000000000 +0200
@@ -125,7 +125,7 @@
 libaugeas_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libaugeas_la_LDFLAGS) $(LDFLAGS) -o $@
-libfa_la_LIBADD =
+libfa_la_LIBADD = $(GNULIB)
 am_libfa_la_OBJECTS = fa.lo hash.lo memory.lo
 libfa_la_OBJECTS = $(am_libfa_la_OBJECTS)
 libfa_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
diff -urN augeas-0.5.1/src/augparse.c augeas-0.5.1.new/src/augparse.c
--- augeas-0.5.1/src/augparse.c	2009-04-09 07:15:56.000000000 +0200
+++ augeas-0.5.1.new/src/augparse.c	2009-06-19 11:33:14.000000000 +0200
@@ -22,7 +22,6 @@
 
 #include <config.h>
 #include <argz.h>
-#include <getopt.h>
 
 #include "list.h"
 #include "syntax.h"
@@ -51,18 +50,10 @@
         VAL_NO_STDINC = CHAR_MAX + 1,
         VAL_NO_TYPECHECK = VAL_NO_STDINC + 1
     };
-    struct option options[] = {
-        { "help",      0, 0, 'h' },
-        { "include",   1, 0, 'I' },
-        { "nostdinc",  0, 0, VAL_NO_STDINC },
-        { "notypecheck",  0, 0, VAL_NO_TYPECHECK },
-        { 0, 0, 0, 0}
-    };
-    int idx;
     unsigned int flags = AUG_TYPE_CHECK|AUG_NO_MODL_AUTOLOAD;
     progname = argv[0];
 
-    while ((opt = getopt_long(argc, argv, "hI:", options, &idx)) != -1) {
+    while ((opt = getopt(argc, argv, "hI:")) != -1) {
         switch(opt) {
         case 'I':
             argz_add(&loadpath, &loadpathlen, optarg);
diff -urN augeas-0.5.1/src/augtool.c augeas-0.5.1.new/src/augtool.c
--- augeas-0.5.1/src/augtool.c	2009-06-10 01:19:50.000000000 +0200
+++ augeas-0.5.1.new/src/augtool.c	2009-06-19 11:32:19.000000000 +0200
@@ -27,7 +27,6 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 #include <argz.h>
-#include <getopt.h>
 #include <limits.h>
 
 struct command {
@@ -577,21 +576,8 @@
         VAL_NO_LOAD = VAL_NO_STDINC + 1,
         VAL_NO_AUTOLOAD = VAL_NO_LOAD + 1
     };
-    struct option options[] = {
-        { "help",      0, 0, 'h' },
-        { "typecheck", 0, 0, 'c' },
-        { "backup",    0, 0, 'b' },
-        { "new",       0, 0, 'n' },
-        { "root",      1, 0, 'r' },
-        { "include",   1, 0, 'I' },
-        { "nostdinc",  0, 0, VAL_NO_STDINC },
-        { "noload",    0, 0, VAL_NO_LOAD },
-        { "noautoload", 0, 0, VAL_NO_AUTOLOAD },
-        { 0, 0, 0, 0}
-    };
-    int idx;
 
-    while ((opt = getopt_long(argc, argv, "hnbcr:I:", options, &idx)) != -1) {
+    while ((opt = getopt(argc, argv, "hnbcr:I:")) != -1) {
         switch(opt) {
         case 'c':
             flags |= AUG_TYPE_CHECK;