diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java
index 2506888c156..589bb364723 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java
@@ -1195,6 +1195,8 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
 		// name
 		enumerator.getName().accept(this);
 
+		formatAttributes(enumerator, true, false, ICPPASTAttributeList.TYPE_FILTER);
+
 		// optional value assignment
 		final IASTExpression value = enumerator.getValue();
 		if (value != null) {
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CodeFormatterTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CodeFormatterTest.java
index c112ca61d88..3d9e189d1cd 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CodeFormatterTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CodeFormatterTest.java
@@ -4708,4 +4708,13 @@ public class CodeFormatterTest extends BaseUITestCase {
 	public void testMacroInFunctionParameters_Bug550096() throws Exception {
 		assertFormatterResult();
 	}
+
+	//enum {A[[maybe_unused]],B[[maybe_unused]]=42};
+
+	//enum {
+	//	A [[maybe_unused]], B [[maybe_unused]] = 42
+	//};
+	public void testEnumWithAttributes_Bug559545() throws Exception {
+		assertFormatterResult();
+	}
 }