diff --git a/src/dfmt.d b/src/dfmt.d
index 8eba3fb..ae5f09f 100644
--- a/src/dfmt.d
+++ b/src/dfmt.d
@@ -380,6 +380,11 @@ private:
                 if (!currentIs(tok!";"))
                     write(" ");
                 break;
+            case tok!"enum":
+                indents.push(tok!"enum");
+                writeToken();
+                write(" ");
+                break;
             default:
                 if (index + 1 < tokens.length)
                 {
@@ -670,7 +675,12 @@ private:
                 break;
             case tok!",":
                 regenLineBreakHintsIfNecessary(index);
-                if (!peekIs(tok!"}") && (linebreakHints.canFind(index)
+                if (indents.indentToMostRecent(tok!"enum") != -1 && !peekIs(tok!"}"))
+                {
+                    writeToken();
+                    newline();
+                }
+                else if (!peekIs(tok!"}") && (linebreakHints.canFind(index)
                         || (linebreakHints.length == 0 && currentLineLength > config.columnSoftLimit)))
                 {
                     writeToken();
diff --git a/tests/allman/issue0052.d.ref b/tests/allman/issue0052.d.ref
index df883a3..6afb585 100644
--- a/tests/allman/issue0052.d.ref
+++ b/tests/allman/issue0052.d.ref
@@ -1,6 +1,9 @@
 enum Flags : int
 {
-    IS_NOT_TOP_TYPE = 0x1, MANGLE_RETURN_TYPE = 0x2, IGNORE_CONST = 0x4, IS_DMC = 0x8,
+    IS_NOT_TOP_TYPE = 0x1,
+    MANGLE_RETURN_TYPE = 0x2,
+    IGNORE_CONST = 0x4,
+    IS_DMC = 0x8,
 }
 
 auto a = [b, c, d,];
diff --git a/tests/allman/issue0053.d.ref b/tests/allman/issue0053.d.ref
index 7e89e6f..998250d 100644
--- a/tests/allman/issue0053.d.ref
+++ b/tests/allman/issue0053.d.ref
@@ -1,7 +1,12 @@
 enum DYNCAST : int
 {
-    DYNCAST_OBJECT, DYNCAST_EXPRESSION, DYNCAST_DSYMBOL, DYNCAST_TYPE,
-        DYNCAST_IDENTIFIER, DYNCAST_TUPLE, DYNCAST_PARAMETER,
+    DYNCAST_OBJECT,
+    DYNCAST_EXPRESSION,
+    DYNCAST_DSYMBOL,
+    DYNCAST_TYPE,
+    DYNCAST_IDENTIFIER,
+    DYNCAST_TUPLE,
+    DYNCAST_PARAMETER,
 }
 
 alias MATCHnomatch = MATCH.MATCHnomatch;
diff --git a/tests/allman/issue0054.d.ref b/tests/allman/issue0054.d.ref
index 9927851..397f972 100644
--- a/tests/allman/issue0054.d.ref
+++ b/tests/allman/issue0054.d.ref
@@ -3,9 +3,15 @@ struct ClassFlags
     alias Type = uint;
     enum Enum : int
     {
-        isCOMclass = 0x1, noPointers = 0x2, hasOffTi = 0x4, hasCtor = 0x8,
-            hasGetMembers = 0x10, hasTypeInfo = 0x20, isAbstract = 0x40,
-            isCPPclass = 0x80, hasDtor = 0x100,
+        isCOMclass = 0x1,
+        noPointers = 0x2,
+        hasOffTi = 0x4,
+        hasCtor = 0x8,
+        hasGetMembers = 0x10,
+        hasTypeInfo = 0x20,
+        isAbstract = 0x40,
+        isCPPclass = 0x80,
+        hasDtor = 0x100,
 
     }
 
diff --git a/tests/otbs/issue0052.d.ref b/tests/otbs/issue0052.d.ref
index 52896d2..4816bf1 100644
--- a/tests/otbs/issue0052.d.ref
+++ b/tests/otbs/issue0052.d.ref
@@ -1,5 +1,8 @@
 enum Flags : int {
-    IS_NOT_TOP_TYPE = 0x1, MANGLE_RETURN_TYPE = 0x2, IGNORE_CONST = 0x4, IS_DMC = 0x8,
+    IS_NOT_TOP_TYPE = 0x1,
+    MANGLE_RETURN_TYPE = 0x2,
+    IGNORE_CONST = 0x4,
+    IS_DMC = 0x8,
 }
 
 auto a = [b, c, d,];
diff --git a/tests/otbs/issue0053.d.ref b/tests/otbs/issue0053.d.ref
index 0873e4d..d595a7e 100644
--- a/tests/otbs/issue0053.d.ref
+++ b/tests/otbs/issue0053.d.ref
@@ -1,6 +1,11 @@
 enum DYNCAST : int {
-    DYNCAST_OBJECT, DYNCAST_EXPRESSION, DYNCAST_DSYMBOL, DYNCAST_TYPE,
-        DYNCAST_IDENTIFIER, DYNCAST_TUPLE, DYNCAST_PARAMETER,
+    DYNCAST_OBJECT,
+    DYNCAST_EXPRESSION,
+    DYNCAST_DSYMBOL,
+    DYNCAST_TYPE,
+    DYNCAST_IDENTIFIER,
+    DYNCAST_TUPLE,
+    DYNCAST_PARAMETER,
 }
 
 alias MATCHnomatch = MATCH.MATCHnomatch;
diff --git a/tests/otbs/issue0054.d.ref b/tests/otbs/issue0054.d.ref
index 38200fd..6ecadf9 100644
--- a/tests/otbs/issue0054.d.ref
+++ b/tests/otbs/issue0054.d.ref
@@ -1,9 +1,15 @@
 struct ClassFlags {
     alias Type = uint;
     enum Enum : int {
-        isCOMclass = 0x1, noPointers = 0x2, hasOffTi = 0x4, hasCtor = 0x8,
-            hasGetMembers = 0x10, hasTypeInfo = 0x20, isAbstract = 0x40,
-            isCPPclass = 0x80, hasDtor = 0x100,
+        isCOMclass = 0x1,
+        noPointers = 0x2,
+        hasOffTi = 0x4,
+        hasCtor = 0x8,
+        hasGetMembers = 0x10,
+        hasTypeInfo = 0x20,
+        isAbstract = 0x40,
+        isCPPclass = 0x80,
+        hasDtor = 0x100,
 
     }