Makefile                            |  3 +--
 Makefile.generic => Makefile.native | 12 +++++++-----
 nnn.c                               |  4 +++-

diff --git a/Makefile b/Makefile
index efd9555a355332717073b078bd5f260cfe129b11..2394a4772975a147d72fdc45db995447963ce4eb 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 PREFIX = /usr/local
 MANPREFIX = $(PREFIX)/share/man
 
-CFLAGS += -O3 -march=native -Wall -Wextra -Wno-unused-parameter
+CFLAGS += -O2 -Wall -Wextra -Wno-unused-parameter
 LDLIBS = -lreadline
 
 ifeq ($(shell pkg-config ncursesw && echo 1),1)
@@ -12,7 +12,6 @@ 	LDLIBS += $(shell pkg-config --libs   ncursesw)
 else
 	LDLIBS += -lncurses
 endif
-
 
 DISTFILES = nlay nnn.c config.def.h nnn.1 Makefile README.md LICENSE
 LOCALCONFIG = config.h
diff --git a/Makefile.generic b/Makefile.native
rename from Makefile.generic
rename to Makefile.native
index c4e8fdd0416d34810676fff73d196d7d2faac81b..310f138d9e78069011e28a0eaf66e303bfa002d6 100644
--- a/Makefile.generic
+++ b/Makefile.native
@@ -1,14 +1,16 @@
-VERSION = 1.0
+VERSION = 1.1
 
 PREFIX = /usr/local
 MANPREFIX = $(PREFIX)/share/man
 
-CFLAGS += -O2 -Wall -Wextra -Wno-unused-parameter
+CFLAGS += -O3 -march=native -Wall -Wextra -Wno-unused-parameter
 LDLIBS = -lreadline
-ifeq ($(shell uname), Darwin)
-    LDLIBS += -lncurses
+
+ifeq ($(shell pkg-config ncursesw && echo 1),1)
+	CFLAGS += $(shell pkg-config --cflags ncursesw)
+	LDLIBS += $(shell pkg-config --libs   ncursesw)
 else
-    LDLIBS += -lncursesw
+	LDLIBS += -lncurses
 endif
 
 DISTFILES = nlay nnn.c config.def.h nnn.1 Makefile README.md LICENSE
diff --git a/nnn.c b/nnn.c
index 1bd9a6702e23caf635af23f097033852f15fd47e..7d93893bf5117e819a406e83fa566e01311a82d9 100644
--- a/nnn.c
+++ b/nnn.c
@@ -28,7 +28,9 @@ #include <unistd.h>
 #include <wchar.h>
 #include <readline/readline.h>
 
-#define __USE_XOPEN_EXTENDED
+#ifndef __USE_XOPEN_EXTENDED
+#define __USE_XOPEN_EXTENDED 1
+#endif
 #include <ftw.h>
 
 #ifdef DEBUG