diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 3de427a..16eb759 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -202,6 +202,10 @@ private:
         {
             formatBlockHeader();
         }
+		else if (currentIs(tok!"do"))
+		{
+			formatBlockHeader();
+		}
         else if (currentIs(tok!"else"))
         {
             formatElse();
@@ -690,6 +694,8 @@ private:
 
     void formatBlockHeader()
     {
+		//import std.stdio:stderr;
+		//stderr.writeln(__FUNCTION__);
         immutable bool a = !currentIs(tok!"version") && !currentIs(tok!"debug");
         immutable bool b = a
             || astInformation.conditionalWithElseLocations.canFindIndex(current.index);
@@ -701,8 +707,11 @@ private:
         if (shouldPushIndent)
             indents.push(current.type);
         writeToken();
-        write(" ");
-        writeParens(false);
+		if (currentIs(tok!"("))
+		{
+			write(" ");
+			writeParens(false);
+		}
         if (currentIs(tok!"switch") || (currentIs(tok!"final") && peekIs(tok!"switch")))
             write(" ");
         else if (currentIs(tok!"comment"))
@@ -1475,7 +1484,7 @@ const pure @safe @nogc:
             return false;
         auto t = tokens[i + index].type;
         return t == tok!"for" || t == tok!"foreach" || t == tok!"foreach_reverse"
-            || t == tok!"while" || t == tok!"if" || t == tok!"out"
+            || t == tok!"while" || t == tok!"if" || t == tok!"out" || t == tok!"do"
             || t == tok!"catch" || t == tok!"with" || t == tok!"synchronized"
             || t == tok!"scope";
     }
diff --git a/tests/allman/issue0185.d.ref b/tests/allman/issue0185.d.ref
new file mode 100644
index 0000000..2db9996
--- /dev/null
+++ b/tests/allman/issue0185.d.ref
@@ -0,0 +1,15 @@
+unittest
+{
+    do
+        ++a;
+    while (true);
+}
+
+unittest
+{
+    do
+    {
+        ++a;
+    }
+    while (true);
+}
diff --git a/tests/issue0185.d b/tests/issue0185.d
new file mode 100644
index 0000000..c48f4e9
--- /dev/null
+++ b/tests/issue0185.d
@@ -0,0 +1,15 @@
+unittest
+{
+	do
+		++a;
+	while (true);
+}
+
+unittest
+{
+	do
+	{
+		++a;
+	}
+	while (true);
+}
diff --git a/tests/otbs/issue0185.d.ref b/tests/otbs/issue0185.d.ref
new file mode 100644
index 0000000..8932e46
--- /dev/null
+++ b/tests/otbs/issue0185.d.ref
@@ -0,0 +1,12 @@
+unittest {
+    do
+        ++a;
+    while (true);
+}
+
+unittest {
+    do {
+        ++a;
+    }
+    while (true);
+}