diff --git a/lib/codelog/command/setup.rb b/lib/codelog/command/setup.rb
index <HASH>..<HASH> 100644
--- a/lib/codelog/command/setup.rb
+++ b/lib/codelog/command/setup.rb
@@ -18,6 +18,7 @@ module Codelog
           system! 'mkdir changelogs/unreleased'
           system! 'mkdir changelogs/releases'
           system! 'touch changelogs/template.yml'
+          system! 'touch changelogs/unreleased/.gitkeep'
         end
       end
 
diff --git a/lib/codelog/version.rb b/lib/codelog/version.rb
index <HASH>..<HASH> 100644
--- a/lib/codelog/version.rb
+++ b/lib/codelog/version.rb
@@ -1,3 +1,3 @@
 module Codelog
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end
diff --git a/spec/codelog/command/setup_spec.rb b/spec/codelog/command/setup_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/codelog/command/setup_spec.rb
+++ b/spec/codelog/command/setup_spec.rb
@@ -23,6 +23,10 @@ describe Codelog::Command::Setup do
     it 'creates a template file' do
       expect(subject).to have_received(:system).with('touch changelogs/template.yml')
     end
+
+    it 'creates a .gitkeep file on the unreleased folder'  do
+      expect(subject).to have_received(:system).with('touch changelogs/unreleased/.gitkeep')
+    end
   end
 
   describe '.run' do
Generating .gitkeep file on setup command