diff --git a/base-foc/config/x86_64.kernel b/base-foc/config/x86_64.kernel
new file mode 100644
index 000000000..6e6ec4314
--- /dev/null
+++ b/base-foc/config/x86_64.kernel
@@ -0,0 +1,72 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Fiasco configuration
+#
+
+#
+# Target configuration
+#
+# CONFIG_IA32 is not set
+CONFIG_AMD64=y
+# CONFIG_ARM is not set
+CONFIG_PF_PC=y
+CONFIG_ABI_VF=y
+CONFIG_AMD64_K8=y
+# CONFIG_AMD64_CORE2 is not set
+# CONFIG_AMD64_ATOM is not set
+# CONFIG_AMD64_K10 is not set
+# CONFIG_CPU_VIRT is not set
+CONFIG_SCHED_APIC=y
+# CONFIG_WORKAROUND_AMD_FPU_LEAK is not set
+
+#
+# Kernel options
+#
+CONFIG_MP=y
+CONFIG_MP_MAX_CPUS=4
+CONFIG_CONTEXT_4K=y
+CONFIG_IO_PROT=y
+# CONFIG_FINE_GRAINED_CPUTIME is not set
+CONFIG_SCHED_FIXED_PRIO=y
+# CONFIG_SCHED_WFQ is not set
+# CONFIG_SCHED_FP_WFQ is not set
+# CONFIG_DISABLE_VIRT_OBJ_SPACE is not set
+
+#
+# Debugging
+#
+CONFIG_INLINE=y
+# CONFIG_NDEBUG is not set
+CONFIG_NO_FRAME_PTR=y
+CONFIG_STACK_DEPTH=y
+# CONFIG_LIST_ALLOC_SANITY is not set
+# CONFIG_BEFORE_IRET_SANITY is not set
+# CONFIG_IRQ_SPINNER is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_SERIAL=y
+CONFIG_JDB=y
+CONFIG_JDB_LOGGING=y
+CONFIG_JDB_DISASM=y
+CONFIG_JDB_GZIP=y
+CONFIG_JDB_MISC=y
+CONFIG_POWERSAVE_GETCHAR=y
+# CONFIG_WARN_NONE is not set
+CONFIG_WARN_WARNING=y
+# CONFIG_WARN_ANY is not set
+
+#
+# Compiling
+#
+CONFIG_CC="gcc"
+CONFIG_CXX="g++"
+CONFIG_HOST_CC="gcc"
+CONFIG_HOST_CXX="g++"
+CONFIG_MAINTAINER_MODE=y
+CONFIG_LABEL=""
+CONFIG_EXPERIMENTAL=y
+CONFIG_PERF_CNT=y
+CONFIG_BIT64=y
+CONFIG_WARN_LEVEL=1
+CONFIG_XARCH="amd64"
+CONFIG_IA32_TARGET="AMD Opteron"
+CONFIG_ABI="vf"
diff --git a/base-foc/src/kernel/x86_64/target.mk b/base-foc/src/kernel/x86_64/target.mk
index 2b002cfed..f01766c42 100644
--- a/base-foc/src/kernel/x86_64/target.mk
+++ b/base-foc/src/kernel/x86_64/target.mk
@@ -1,5 +1,4 @@
 REQUIRES      = x86 64bit
-FIASCO_DIR    = $(REP_DIR)/contrib/kernel/fiasco
-KERNEL_CONFIG = $(FIASCO_DIR)/src/templates/globalconfig.out.amd64-mp
+KERNEL_CONFIG = $(REP_DIR)/config/x86_64.kernel
 
 -include $(PRG_DIR)/../target.inc