diff --git a/src/dfmt.d b/src/dfmt.d
index f89db25..60f4f6e 100644
--- a/src/dfmt.d
+++ b/src/dfmt.d
@@ -228,7 +228,8 @@ private:
         else if (current.type == tok!"return")
         {
             writeToken();
-            write(" ");
+            if (current.type != tok!";")
+                write(" ");
         }
         else if (current.type == tok!"switch")
             formatSwitch();
diff --git a/tests/DeclSpacing.d b/tests/DeclSpacing.d
new file mode 100644
index 0000000..17273ac
--- /dev/null
+++ b/tests/DeclSpacing.d
@@ -0,0 +1,7 @@
+import std.stdio;
+class Foo {}
+import std.conv;
+const bar = 42;
+void main() {return;}
+const baz = 11;
+class Foo2:Foo {}
diff --git a/tests/DeclSpacing.d.ref b/tests/DeclSpacing.d.ref
new file mode 100644
index 0000000..45b04ec
--- /dev/null
+++ b/tests/DeclSpacing.d.ref
@@ -0,0 +1,20 @@
+import std.stdio;
+
+class Foo
+{
+}
+
+import std.conv;
+
+const bar = 42;
+
+void main()
+{
+    return;
+}
+
+const baz = 11;
+
+class Foo2 : Foo
+{
+}