diff --git a/Gemfile.lock b/Gemfile.lock
index 9f360122b..f61479045 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -384,3 +384,6 @@ DEPENDENCIES
   vcr
   webmock
   whenever
+
+BUNDLED WITH
+   1.10.0
diff --git a/app/models/post.rb b/app/models/post.rb
index 657a5e179..b1201b32f 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -184,7 +184,7 @@ class Post < ActiveRecord::Base
     end
 
     def twitter_card_supported?
-      image_width.to_i >= 280 && image_height.to_i >= 150
+      image_width.to_i >= 280 && image_height.to_i >= 150 && file_size <= 1.megabyte
     end
 
     def has_large?
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index dfb486e18..9d224943c 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -163,10 +163,11 @@
 
   <!-- Twitter properties -->
   <% if @post.twitter_card_supported? %>
-    <meta name="twitter:card" content="photo">
-    <meta name="twitter:image:src" content="http://<%= Danbooru.config.hostname %><%= @post.large_file_url %>">
-    <meta name="twitter:image:width" content="<%= @post.image_width %>">
-    <meta name="twitter:image:height" content="<%= @post.image_height %>">
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:site" content="<%= Danbooru.config.twitter_site %>">
+    <meta name="twitter:title" content="<%= @post.presenter.humanized_essential_tag_string %> - <%= Danbooru.config.app_name %>">
+    <meta name="twitter:description" content="<%= @post.presenter.humanized_tag_string %> - <%= Danbooru.config.app_name %>">
+    <meta name="twitter:image" content="http://<%= Danbooru.config.hostname %><%= @post.large_file_url %>">
   <% end %>
 <% end %>
 
diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb
index 5ade06b0c..4b02dd46f 100644
--- a/config/danbooru_default_config.rb
+++ b/config/danbooru_default_config.rb
@@ -392,5 +392,9 @@ module Danbooru
         false
       end
     end
+
+    def twitter_site
+      "@teruyo"
+    end
   end
 end