diff --git a/compiler/Makefile b/compiler/Makefile
index 9e77626d8e..f1ba4035e8 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -496,6 +496,15 @@ endif
 endif
 endif
 override LOCALOPT+=-d$(CPC_TARGET) -dGDB -dBROWSERLOG
+ifdef LLVM
+ifeq ($(findstring $(PPC_TARGET),x86_64),)
+$(error The $(PPC_TARGET) architecture is not (yet) support by the FPC/LLVM code generator)
+endif
+ifeq ($(findstring $(OS_TARGET),darwin iphonesim linux),)
+$(error The $(PPC_TARGET) target OS is not (yet) support by the FPC/LLVM code generator)
+endif
+override LOCALOPT+=-dllvm -Fullvm
+endif
 ifeq ($(PPC_TARGET),i386)
 override LOCALOPT+=-Fux86
 endif
diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc
index 5cb83b174c..08b6b029d1 100644
--- a/compiler/Makefile.fpc
+++ b/compiler/Makefile.fpc
@@ -241,6 +241,19 @@ endif
 # set correct defines (-d$(CPU_TARGET) is automatically added in makefile.fpc)
 override LOCALOPT+=-d$(CPC_TARGET) -dGDB -dBROWSERLOG
 
+#include LLVM define/directory if requested
+ifdef LLVM
+ifeq ($(findstring $(PPC_TARGET),x86_64),)
+$(error The $(PPC_TARGET) architecture is not (yet) support by the FPC/LLVM code generator)
+endif
+
+ifeq ($(findstring $(OS_TARGET),darwin iphonesim linux),)
+$(error The $(PPC_TARGET) target OS is not (yet) support by the FPC/LLVM code generator)
+endif
+
+override LOCALOPT+=-dllvm -Fullvm
+endif
+
 # i386 specific
 ifeq ($(PPC_TARGET),i386)
 override LOCALOPT+=-Fux86