diff --git a/Rakefile b/Rakefile
index 8e1b6f328..85e46452f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -83,8 +83,21 @@ end
 # SSL/TLS certificate
 
 namespace :ssl do
-  desc 'Re-generate SSL certificate'
+  desc 'Create a new SSL certificate'
   task :create do
+    if File.file?('beef_key.pem')
+      puts 'Certificate already exists. Replace? [Y/n]'
+      confirm = STDIN.getch.chomp
+      unless confirm.eql?('') || confirm.downcase.eql?('y')
+        puts "Aborted"
+        exit 1
+      end
+    end
+    Rake::Task['ssl:replace'].invoke
+  end
+
+  desc 'Re-generate SSL certificate'
+  task :replace do
     if File.file?('/usr/local/bin/openssl')
       path = '/usr/local/bin/openssl'
     elsif File.file?('/usr/bin/openssl')