diff --git a/lib/svn2git/migration.rb b/lib/svn2git/migration.rb
index 4de8a9e..e966360 100755
--- a/lib/svn2git/migration.rb
+++ b/lib/svn2git/migration.rb
@@ -51,6 +51,7 @@ def parse(args)
       options[:tags] = []
       options[:exclude] = []
       options[:revision] = nil
+      options[:stdlayout] = nil
       options[:username] = nil
       options[:password] = nil
       options[:rebasebranch] = false
@@ -96,6 +97,15 @@ def parse(args)
           options[:trunk] = nil
           options[:branches] = nil
           options[:tags] = nil
+          options[:stdlayout] = false
+        end
+
+        opts.on('--stdlayout', 'Use this when the standard layout applies to trunk, tags, and branches') do
+          options[:stdlayout] = true
+          options[:trunk] = nil
+          options[:branches] = nil
+          options[:tags] = nil
+          options[:rootistrunk] = false
         end
 
         opts.on('--notrunk', 'Do not import anything from trunk') do
@@ -173,6 +183,7 @@ def clone!
       metadata = @options[:metadata]
       nominimizeurl = @options[:nominimizeurl]
       rootistrunk = @options[:rootistrunk]
+      stdlayout = @options[:stdlayout]
       authors = @options[:authors]
       exclude = @options[:exclude]
       revision = @options[:revision]
@@ -201,6 +212,9 @@ def clone!
         if nominimizeurl
           cmd += "--no-minimize-url "
         end
+        if stdlayout
+          cmd += "--stdlayout "
+        end
         cmd += "--trunk='#{trunk}' " unless trunk.nil?
         unless tags.nil?
           # Fill default tags here so that they can be filtered later