diff --git a/build/config.mk b/build/config.mk
index 76cdc514..5dd72bbe 100644
--- a/build/config.mk
+++ b/build/config.mk
@@ -55,6 +55,11 @@ ifeq ($(PROC),powerpc)
     PROC := ppc
 endif
 
+ifeq ($(OS),Linux)
+    PROC := $(shell uname -m)
+    USE_ICONV := 0
+endif
+
 debug    : BUILD = debug
 valgrind : BUILD = debug
 release  : BUILD = release
@@ -90,6 +95,12 @@ else
     CONFIG_CFLAGS += -DWORDS_BIGENDIAN=0
 endif
 
+ifeq ($(OS),Linux)
+	ifeq ($(PROC),x86_64)
+        CONFIG_CFLAGS += -fPIC
+	endif
+endif
+
 ifneq (0,$(USE_ICONV))
     CONFIG_CFLAGS += -DHAVE_ICONV
     ICONV_LIBS = -liconv