diff --git a/programming/build/ninja/actions.py b/programming/build/ninja/actions.py
index 96f10d7c19..ebed583e41 100644
--- a/programming/build/ninja/actions.py
+++ b/programming/build/ninja/actions.py
@@ -13,7 +13,7 @@ from pisi.actionsapi import get
 def build():
     shelltools.system("python configure.py --bootstrap")
     shelltools.system("asciidoc doc/manual.asciidoc")
-    #shelltools.system("emacs -Q --batch -f batch-byte-compile misc/ninja-mode.el")
+    shelltools.system("emacs -Q --batch -f batch-byte-compile misc/ninja-mode.el")
 
 def check():
     #needs new package gtest -> ignore it for now
@@ -25,6 +25,10 @@ def install():
     pisitools.dobin("ninja", "/usr/bin")
 
     pisitools.insinto("/usr/share/bash-completion/completions", "misc/bash-completion", "ninja")
+    pisitools.insinto("/usr/share/emacs/site-lisp", "misc/ninja-mode.el")
+    pisitools.insinto("/usr/share/emacs/site-lisp", "misc/ninja-mode.elc")
+    pisitools.insinto("/usr/share/vim/vimfiles/syntax", "misc/ninja.vim")
+    pisitools.insinto("/usr/share/zsh/site-functions", "misc/zsh-completion", "_ninja")
 
     pisitools.dodoc("HACKING.md", "COPYING", "RELEASING", "README", "doc/manual.asciidoc")
 
diff --git a/programming/build/ninja/pspec.xml b/programming/build/ninja/pspec.xml
index 6582324cc2..0448fce60b 100644
--- a/programming/build/ninja/pspec.xml
+++ b/programming/build/ninja/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>app:console</IsA>
         <Summary>Ninja is a small build system with a focus on speed.</Summary>
         <Description>Ninja is a small build system with a focus on speed.</Description>
-        <Archive sha1sum="a50e9008e90339d052f741e9c52a3475aa108fbb" type="targz">https://github.com/ninja-build/ninja/archive/v1.7.2.tar.gz</Archive>
+        <Archive sha1sum="17219deb34dd816363e37470f77ff7231509143a" type="targz">https://github.com/ninja-build/ninja/archive/v1.8.2.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>re2c</Dependency>
             <Dependency>asciidoc</Dependency>
@@ -37,6 +37,13 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2017-10-08</Date>
+            <Version>1.8.2</Version>
+            <Comment>Version Bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="4">
             <Date>2017-02-22</Date>
             <Version>1.7.2</Version>