diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix
index 59922d11a39e..59e0b6b03fae 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix
@@ -9,6 +9,7 @@
 
 melpaBuild {
   pname = "elisp-ffi";
+  ename = "ffi";
   version = "1.0.0-unstable-2017-05-18";
 
   src = fetchFromGitHub {
@@ -18,13 +19,14 @@ melpaBuild {
     hash = "sha256-StOezQEnNTjRmjY02ub5FRh59aL6gWfw+qgboz0wF94=";
   };
 
+  files = ''(:defaults "ffi-glue")'';
+
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ libffi ];
 
   preBuild = ''
-    mv ffi.el elisp-ffi.el
-    make
+    make CXX=$CXX
   '';
 
   ignoreCompilationError = false;