diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -7,41 +7,29 @@
 
 SHELL=/bin/bash
 
--include Makefile.config
-
-##################################################################
-#
-# For easy updates you can copy these basic definitions in
-# Makefile.config
-# and place that next to the Makefile. This will allow easy
-# updates to the generic Makefile
-#
 ##################################################################
 
-# Definition of the grfs
-REPO_NAME           ?= My NewGRF
+REPO_NAME          := FIRS Industry Replacement Set
 
-# This is the filename part common to the grf file, main source file and the tar name
-BASE_FILENAME       ?= mynewgrf
+BASE_FILENAME      := firs
 
-# Documentation files
-#DOC_FILES ?= docs/readme.txt docs/license.txt docs/changelog.txt
+# Documentation files:
+# DOC_FILES := docs/changelog.txt docs/readme.txt docs/license.txt
 
-# Directory structure
-SCRIPT_DIR          ?= build-common
+SCRIPT_DIR         := scripts
 
-# Uncomment in order to make use of gimp scripting. See the file
-# for a description of the format
-# GFX_SCRIPT_LIST_FILES      := gfx/png_source_list
+# Offset of default branch (increase, if there is a new release branch)
+REPO_BRANCH_VERSION := 0
 
-# If needed, declare the minimum NML requirements
-# REQUIRED_NML_BRANCH  = 0.3
-# MIN_NML_REVISION     = 0
+# If everything is default, you don't need the rest:
 
-##################################################################
-#
-# Everything below here usually need not change for simple NewGRFs
-#
+NML_MIN_REVISION    := 2044
+NML_MIN_VERSION     := 030
+
+# needed for using python 2 compile with python 3 nml
+PYTHONPATH2=../../lib/python2.6/site-packages
+PYTHON2=python2.7
+
 ##################################################################
 
 # Define the filenames of the grf and nml file. They must be in the main directoy
diff --git a/Makefile.config b/Makefile.config
deleted file mode 100644
--- a/Makefile.config
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file defines the principal settings for this project
-
-REPO_NAME          := FIRS Industry Replacement Set
-
-BASE_FILENAME      := firs
-
-# Documentation files:
-# DOC_FILES := docs/changelog.txt docs/readme.txt docs/license.txt
-
-# comment out those dirs which are not in use
-SCRIPT_DIR         := scripts
-
-# Offset of default branch (increase, if there is a new release branch)
-REPO_BRANCH_VERSION := 0
-
-# If everything is default, you don't need the rest:
-
-NML_MIN_REVISION    := 2044
-NML_MIN_VERSION     := 030
-
-# needed for using python 2 compile with python 3 nml
-PYTHONPATH2=../../lib/python2.6/site-packages
-PYTHON2=python2.7