diff --git a/app/models/mime_type.rb b/app/models/mime_type.rb
index e8bc1816ca23da2cbb551c469bea72cb0f5362dd..4aa9f72fc04926d9e63f56e978b7ca7e57644311 100644
--- a/app/models/mime_type.rb
+++ b/app/models/mime_type.rb
@@ -1,2 +1,3 @@
 class MimeType < ActiveRecord::Base
+  has_and_belongs_to_many :object_types
 end
diff --git a/app/models/object_type.rb b/app/models/object_type.rb
index 5b3513a6562e61e5b9f89a42d04e60a1f89360ae..072d1e49e45cb5ebc18b1b6b984c42b69f148126 100644
--- a/app/models/object_type.rb
+++ b/app/models/object_type.rb
@@ -1,5 +1,6 @@
 class ObjectType < ActiveRecord::Base
   has_many :learning_objects
+  has_and_belongs_to_many :mime_types
 
   validates :name, presence: true
 end
diff --git a/db/migrate/20160310124058_remove_mime_types_from_object_types.rb b/db/migrate/20160310124058_remove_mime_types_from_object_types.rb
new file mode 100644
index 0000000000000000000000000000000000000000..22f7df4a07088f751ae6e534e21babcbf988aa02
--- /dev/null
+++ b/db/migrate/20160310124058_remove_mime_types_from_object_types.rb
@@ -0,0 +1,5 @@
+class RemoveMimeTypesFromObjectTypes < ActiveRecord::Migration
+  def change
+    remove_column :object_types, :mime_type, :string
+  end
+end
diff --git a/db/migrate/20160310124059_add_associations_to_object_types_and_mime_types.rb b/db/migrate/20160310124059_add_associations_to_object_types_and_mime_types.rb
new file mode 100644
index 0000000000000000000000000000000000000000..7cb48bc0ea04f2cf75ca2591ee2506f2e5e6f83f
--- /dev/null
+++ b/db/migrate/20160310124059_add_associations_to_object_types_and_mime_types.rb
@@ -0,0 +1,8 @@
+class AddAssociationsToObjectTypesAndMimeTypes < ActiveRecord::Migration
+  def change
+    create_table :mime_types_object_types do |t|
+      t.belongs_to :object_type, index: true
+      t.belongs_to :mime_type, index: true
+    end
+  end
+end