diff --git a/apps/bootstrap/literals.py b/apps/bootstrap/literals.py
index 1161ba4417..479acee4db 100644
--- a/apps/bootstrap/literals.py
+++ b/apps/bootstrap/literals.py
@@ -1,6 +1,12 @@
 from __future__ import absolute_import
 
 import re
+try:
+    import yaml
+except ImportError:
+    YAML_AVAILABLE = False
+else:
+    YAML_AVAILABLE = True
 
 from django.utils.translation import ugettext_lazy as _
 
@@ -10,7 +16,7 @@ FIXTURE_TYPE_XML = 'xml'
 
 FIXTURE_TYPES_CHOICES = (
     (FIXTURE_TYPE_JSON, _(u'JSON')),
-    (FIXTURE_TYPE_YAML, _(u'YAML')),
+    #(FIXTURE_TYPE_YAML, _(u'YAML')),
     # Disabing XML until a way to specify a null pk is found
     #(FIXTURE_TYPE_XML, _(u'XML')),
 )
@@ -28,3 +34,6 @@ FIXTURE_TYPE_PK_NULLIFIER = {
 }
 
 COMMAND_LOADDATA = 'loaddata'
+
+if YAML_AVAILABLE:
+    FIXTURE_TYPES_CHOICES += (FIXTURE_TYPE_YAML, _(u'YAML')),