diff --git a/data/Makefile.am b/data/Makefile.am
index 95e066220e..51dedcc876 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,6 +7,7 @@ filetypes = \
 	filedefs/filetypes.abc \
 	filedefs/filetypes.actionscript \
 	filedefs/filetypes.ada \
+	filedefs/filetypes.Arduino.conf \
 	filedefs/filetypes.asciidoc \
 	filedefs/filetypes.asm \
 	filedefs/filetypes.batch \
diff --git a/data/filedefs/filetypes.Arduino.conf b/data/filedefs/filetypes.Arduino.conf
new file mode 100644
index 0000000000..5deb2a697a
--- /dev/null
+++ b/data/filedefs/filetypes.Arduino.conf
@@ -0,0 +1,44 @@
+[styling=C]
+
+
+[keywords]
+primary=and and_eq asm auto bitand bitor bool boolean break byte case catch char class compl const const_cast constexpr continue decltype default delete do double dynamic_cast else enum explicit extern false final float for friend goto if inline int int8_t int16_t int32_t int64_t long mutable namespace new noexcept not not_eq nullptr operator or or_eq override private protected ptrdiff_t public register reinterpret_cast return short signed sizeof size_t static static_assert static_cast struct switch template this throw true try typedef typeid typename uint8_t uint16_t uint32_t uint64_t union unsigned using virtual void volatile while xor xor_eq
+secondary=abs analogRead analogReadResolution analogReference analogWrite analogWriteResolution attachInterrupt bit bitClear bitRead bitSet bitWrite constrain cos delay delayMicroseconds detachInterrupt digitalRead digitalWrite EEPROM Ethernet F highByte interrupts isAlpha isAlphaNumeric isAscii isControl isDigit isGraph isHexadecimalDigit isLowerCase isPrintable isPunct isSpace isUpperCase isWhitespace Keyboard LiquidCrystal loop lowByte map max micros millis min Mouse noInterrupts noTone pinMode pow PROGMEM pulseIn random randomSeed SD Serial Servo setup shiftIn shiftOut sin SoftwareSerial SPI sqrt Stepper tan tone Wire word yield
+
+
+[lexer_properties=C]
+
+
+[settings]
+lexer_filetype=C
+tag_parser=C
+extension=ino
+
+# context action command (please see Geany's main documentation for details)
+context_action_cmd=xdg-open "https://www.arduino.cc/en/Reference/%s"
+
+
+[indentation]
+#width=2
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=0
+
+
+# Use this reference for making up Arduino command lines:
+# https://github.com/arduino/Arduino/blob/master/build/shared/manpage.adoc
+[build-menu]
+FT_00_LB=_Build
+FT_00_CM=arduino --verify "%d/%f" --board arduino:avr:uno
+FT_00_WD=
+
+FT_01_LB=Build (_Verbose)
+FT_01_CM=arduino --verify --verbose-build "%d/%f" --board arduino:avr:uno
+FT_01_WD=
+
+EX_00_LB=_Upload
+EX_00_CM=arduino --upload "%d/%f" --board arduino:avr:uno
+EX_00_WD=
+
+EX_01_LB=Up_load (Verbose)
+EX_01_CM=arduino --upload --verbose-upload "%d/%f" --board arduino:avr:uno
+EX_01_WD=
diff --git a/data/filetype_extensions.conf b/data/filetype_extensions.conf
index e161d49f69..82de914e59 100644
--- a/data/filetype_extensions.conf
+++ b/data/filetype_extensions.conf
@@ -6,6 +6,7 @@ Abaqus=*.inp;
 Abc=*.abc;*.abp;
 ActionScript=*.as;
 Ada=*.adb;*.ads;
+Arduino=*.ino;*.pde;
 Asciidoc=*.asciidoc;*.adoc;
 ASM=*.asm;*.asm51;*.a51;
 Batch=*.bat;*.cmd;*.nt;
@@ -73,7 +74,7 @@ None=*;
 
 # Note: restarting is required after editing groups
 [Groups]
-Programming=Clojure;CUDA;Cython;Genie;Scala;
+Programming=Arduino;Clojure;CUDA;Cython;Genie;Scala;
 Script=Graphviz;
 Markup=
 Misc=JSON;