diff --git a/python/src/META-INF/python-plugin-common.xml b/python/src/META-INF/python-plugin-common.xml
index 72b470087439..3f0a82fa8663 100644
--- a/python/src/META-INF/python-plugin-common.xml
+++ b/python/src/META-INF/python-plugin-common.xml
@@ -42,6 +42,8 @@
     <stubIndex implementation="com.jetbrains.python.psi.stubs.PyFunctionNameIndex"/>
     <stubIndex implementation="com.jetbrains.python.psi.stubs.PySuperClassIndex"/>
 
+    <fileTypeIndentOptionsProvider implementation="com.jetbrains.python.formatter.PyIndentOptionsProvider"/>
+
     <!-- Run/Debug -->
     <configurationType implementation="com.jetbrains.python.run.PythonConfigurationType"/>
     <programRunner implementation="com.jetbrains.python.run.PythonRunner"/>
diff --git a/python/src/com/jetbrains/python/formatter/PyIndentOptionsProvider.java b/python/src/com/jetbrains/python/formatter/PyIndentOptionsProvider.java
new file mode 100644
index 000000000000..fbfc9167aceb
--- /dev/null
+++ b/python/src/com/jetbrains/python/formatter/PyIndentOptionsProvider.java
@@ -0,0 +1,36 @@
+package com.jetbrains.python.formatter;
+
+import com.intellij.application.options.IndentOptionsEditor;
+import com.intellij.application.options.SmartIndentOptionsEditor;
+import com.intellij.openapi.fileTypes.FileType;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.codeStyle.CodeStyleSettings;
+import com.intellij.psi.codeStyle.FileTypeIndentOptionsProvider;
+import com.jetbrains.python.PythonFileType;
+
+/**
+ * @author yole
+ */
+public class PyIndentOptionsProvider implements FileTypeIndentOptionsProvider {
+  public CodeStyleSettings.IndentOptions createIndentOptions() {
+    final CodeStyleSettings.IndentOptions indentOptions = new CodeStyleSettings.IndentOptions();
+    indentOptions.INDENT_SIZE = 4;
+    return indentOptions;
+  }
+
+  public FileType getFileType() {
+    return PythonFileType.INSTANCE;
+  }
+
+  public IndentOptionsEditor createOptionsEditor() {
+    return new SmartIndentOptionsEditor();
+  }
+
+  public String getPreviewText() {
+    return "def foo():\n"+
+           "    print 'bar'";
+  }
+
+  public void prepareForReformat(final PsiFile psiFile) {
+  }
+}