diff --git a/include/autoconf.h b/include/autoconf.h
index c654dd37d..89af5baba 100644
--- a/include/autoconf.h
+++ b/include/autoconf.h
@@ -148,14 +148,10 @@
 #define ENABLE_UNICODE_PRESERVE_BROKEN 0
 #define IF_UNICODE_PRESERVE_BROKEN(x)
 #define IF_NOT_UNICODE_PRESERVE_BROKEN(x) x
-#define CONFIG_LONG_OPTS 1
-#define ENABLE_LONG_OPTS 1
-#ifdef MAKE_SUID
-# define IF_LONG_OPTS(x) x "CONFIG_LONG_OPTS"
-#else
-# define IF_LONG_OPTS(x) x
-#endif
-#define IF_NOT_LONG_OPTS(x)
+#undef CONFIG_LONG_OPTS
+#define ENABLE_LONG_OPTS 0
+#define IF_LONG_OPTS(x) 
+#define IF_NOT_LONG_OPTS(x) x
 #define CONFIG_FEATURE_DEVPTS 1
 #define ENABLE_FEATURE_DEVPTS 1
 #ifdef MAKE_SUID
diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index ff3c8ce95..2a75357fb 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -10,7 +10,11 @@
 #include "autoconf.h"
 
 #if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG
-# include <getopt.h>
+# ifndef __GNO__
+#  include <getopt.h>
+# else
+#  include <stdlib.h>
+# endif
 #endif
 #include "libbb.h"
 
@@ -303,7 +307,7 @@ const char *opt_complementary;
 enum {
 	PARAM_STRING,
 	PARAM_LIST,
-	PARAM_INT,
+	PARAM_INT
 };
 
 typedef struct {