diff --git a/data/Makefile.am b/data/Makefile.am
index 51dedcc876..7f4c26c0c6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -49,6 +49,7 @@ filetypes = \
 	filedefs/filetypes.makefile \
 	filedefs/filetypes.markdown \
 	filedefs/filetypes.matlab \
+	filedefs/filetypes.Nim.conf \
 	filedefs/filetypes.nsis \
 	filedefs/filetypes.objectivec \
 	filedefs/filetypes.pascal \
diff --git a/data/filedefs/filetypes.Nim.conf b/data/filedefs/filetypes.Nim.conf
new file mode 100644
index 0000000000..4a450f7a04
--- /dev/null
+++ b/data/filedefs/filetypes.Nim.conf
@@ -0,0 +1,29 @@
+# For complete documentation of this file, please see Geany's main documentation
+
+[styling=Python]
+
+[keywords]
+
+primary=addr as asm atomic bind block break case cast const continue converter defer discard distinct div do elif else end enum except export finally for from func generic if import include interface iterator let macro method mixin mod notin object of out proc raise return shl shr static template try type using var when while with without yield seq array tuple ref ptr not and xor in or is isnot new
+
+identifiers=bool byte char int int8 int16 int32 int64 uint uint8 uint16 uint32 uint64 float float32 float64 string nil true false result echo assert
+
+[settings]
+
+extension=nim
+comment_single=#
+comment_use_indent=true
+tag_parser=Python
+lexer_filetype=Python
+
+[indentation]
+
+type=0
+
+[build-menu]
+
+# %f will be replaced by the complete filename
+# %e will be replaced by the filename without extension
+# (use only one of it at one time)
+compiler=nim c "%f"
+run_cmd="./%e"
diff --git a/data/filetype_extensions.conf b/data/filetype_extensions.conf
index 24bc1d1a0d..e50ada2e03 100644
--- a/data/filetype_extensions.conf
+++ b/data/filetype_extensions.conf
@@ -47,6 +47,7 @@ Lua=*.lua;
 Make=*.mak;*.mk;GNUmakefile;makefile;Makefile;makefile.*;Makefile.*;
 Markdown=*.mdml;*.markdown;*.md;*.mkd;*.mkdn;*.mdwn;*.mdown;*.mdtxt;*.mdtext;
 Matlab/Octave=*.m;
+Nim=*.nim;
 NSIS=*.nsi;*.nsh;
 Objective-C=*.m;*.mm;*.h;
 Pascal=*.pas;*.pp;*.inc;*.dpr;*.dpk;