diff --git a/elixir.spec b/elixir.spec
index 5e63046..503f22e 100644
--- a/elixir.spec
+++ b/elixir.spec
@@ -50,6 +50,10 @@ find -name '*.bat' -exec rm \{\} \;
 # this deals with ANSI codes which rpmbuild strips.
 rm lib/elixir/test/elixir/io/ansi_test.exs
 
+# Remove VCS-specific files
+find . -name .gitignore -delete
+find . -name .gitkeep -delete
+
 # Let the Makefile speak!
 sed -i 's/$(Q)//g' Makefile
 
@@ -76,6 +80,9 @@ ln -s %{_datadir}/%{name}/%{version}/bin/{elixir,elixirc,iex,mix} %{buildroot}/%
 mkdir -p %{buildroot}/%{_mandir}/man1
 cp -a man/elixir.1 man/elixirc.1 man/iex.1 man/mix.1 %{buildroot}/%{_mandir}/man1
 
+# Remove (useless) hidden folder created by the build system
+rm -r %{buildroot}/%{_datadir}/%{name}/%{version}/lib/%{name}/.rebar
+
 %files
 %license LICENSE
 %{_bindir}/elixir
@@ -100,6 +107,10 @@ HTML documentation for eex, elixir, iex, logger and mix.
 %doc docs/doc/eex docs/doc/elixir docs/doc/iex docs/doc/logger docs/doc/mix
 
 %changelog
+* Wed Jun 20 2018 Timothée Floure <fnux@fedoraproject.org> - 1.6.5-2
+- Fix version-control-internal-file rpmlint errors
+- Fix hidden-file-or-dir rpmlint warnings
+
 * Thu Jun 07 2018 Timothée Floure <fnux@fedoraproject.org> - 1.6.5-2
 - Switch from the rebar_* macros to upstream's makefile (without forgetting to
   properly set the environment) and fix the build section.