diff --git a/templates/API.html b/templates/API.html
index d58e398c..0234012d 100644
--- a/templates/API.html
+++ b/templates/API.html
@@ -2,6 +2,17 @@
 
 {% block title %}{{sitename}} - API{% endblock %}
 
+{% block opengraph %}
+<meta property="og:title" content="{{ sitename }} - API" />
+<meta property="og:type" content="website" />
+<meta property="og:url" content="{{ siteurl }}{{ sitepath }}{{ filename }}" />
+{% endblock %}
+
+{% block twittercard %}
+<meta name="twitter:card" content="summary" />
+<meta name="twitter:title" content="{{ sitename }} - API" />
+{% endblock %}
+
 {% block head %}
 <link href="{{ sitepath }}static/css/github-markdown.css" rel="stylesheet" type="text/css">
 {% endblock %}
@@ -151,4 +162,4 @@ <h3>Information about a file</h3>
 		</div>
 	</div>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/base.html b/templates/base.html
index 54fd3681..c798749f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -9,6 +9,19 @@
 	<link href='{{ sitepath }}static/css/hint.css' rel='stylesheet' type='text/css'>
 	<link href='{{ sitepath }}static/images/favicon.gif' rel='icon' type='image/gif'>
 	{% block head %}{% endblock %}
+	<meta name="og:site_name" content="{{ sitename }}" />
+	<meta name="twitter:site" content="{{ sitename }}" />
+
+	{% block opengraph %}
+	<meta property="og:title" content="{{ sitename }}" />
+	<meta property="og:type" content="website" />
+	<meta property="og:url" content="{{ siteurl }}{{ sitepath }}{{ filename }}" />
+	{% endblock %}
+
+	{% block twittercard %}
+	<meta name="twitter:card" content="summary" />
+	<meta name="twitter:title" content="{{ sitename }}" />
+	{% endblock %}
 </head>
 
 <body>
@@ -37,4 +50,4 @@ <h2><a href="{{ sitepath }}" title="{{ sitename }}">{{ sitename }}</a></h2>
 	</div>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/templates/display/audio.html b/templates/display/audio.html
index 68d461e0..d216d259 100644
--- a/templates/display/audio.html
+++ b/templates/display/audio.html
@@ -1,8 +1,12 @@
 {% extends "base.html" %}
 
-{% block head %}
+{% block opengraph %}
+<meta property="og:title" content="{{ filename }} ({{ size }})" />
+<meta property="og:type" content="music:song" />
+<meta property="og:url" content="{{ siteurl }}{{ sitepath }}{{ filename }}" />
 <meta property="og:audio" content="{{ siteurl }}{{ sitepath }}{{ selifpath }}{{ filename }}" />
 <meta property="og:audio:secure_url" content="{{ siteurl }}{{ sitepath }}{{ selifpath }}{{ filename }}" />
+<meta property="og:audio:type" content="{{ mime }}" />
 {% endblock %}
 
 {% block main %}
@@ -10,4 +14,4 @@
     <source src='{{ sitepath }}{{ selifpath }}{{ filename }}'>
     <a href='{{ sitepath }}{{ selifpath }}{{ filename }}'>Download it instead</a>
 </audio>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/display/base.html b/templates/display/base.html
index d60f4d88..e2812521 100644
--- a/templates/display/base.html
+++ b/templates/display/base.html
@@ -1,5 +1,16 @@
 {% extends "../base.html" %}
 
+{% block opengraph %}
+<meta property="og:title" content="{{ filename }} ({{ size }})" />
+<meta property="og:type" content="website" />
+<meta property="og:url" content="{{ siteurl }}{{ sitepath }}{{ filename }}" />
+{% endblock %}
+
+{% block twittercard %}
+<meta name="twitter:card" content="summary" />
+<meta name="twitter:title" content="{{ filename }} ({{ size }})" />
+{% endblock %}
+
 {% block title %}{{sitename}} - {{ filename }}{% endblock %}
 
 {% block bodymore %}{% endblock %}
@@ -33,4 +44,4 @@
 </div>
 
 <script src="{{ sitepath }}static/js/clipboard.js"></script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/display/image.html b/templates/display/image.html
index 8dcd844e..90c4d1ab 100644
--- a/templates/display/image.html
+++ b/templates/display/image.html
@@ -1,10 +1,15 @@
 {% extends "base.html" %}
 
-{% block head %}
-<meta name="twitter:card" content="summary_large_image">
+{% block opengraph %}
 <meta property="og:image" content="{{ siteurl }}{{ sitepath }}{{ selifpath }}{{ filename }}" />
 {% endblock %}
 
+{% block twittercard %}
+<meta name="twitter:image" content="{{ siteurl }}{{ sitepath }}{{ selifpath }}{{ filename }}" />
+<meta name="twitter:card" content="summary_large_image">
+<meta name="twitter:text:title" content="{{ filename }} ({{ size }})" />
+{% endblock %}
+
 {% block main %}
 <a href="{{ sitepath }}{{ selifpath }}{{ filename }}">
     <img class="display-image" src="{{ sitepath }}{{ selifpath }}{{ filename }}" />
diff --git a/templates/display/video.html b/templates/display/video.html
index 3cf6a810..d3aba602 100644
--- a/templates/display/video.html
+++ b/templates/display/video.html
@@ -1,13 +1,17 @@
 {% extends "base.html" %}
 
-{% block head %}
+{% block opengraph %}
+<meta property="og:title" content="{{ filename }} ({{ size }})" />
 <meta property="og:type" content="video.other">
+<meta property="og:url" content="{{ siteurl }}{{ sitepath }}{{ filename }}" />
 <meta property="og:video" content="{{ siteurl }}{{ sitepath }}{{ selifpath }}{{ filename }}" />
 {% endblock %}
 
+{% block twittercard %}{% endblock %}
+
 {% block main %}
 <video class="display-video" controls autoplay>
     <source src="{{ sitepath }}{{ selifpath }}{{ filename }}" />
     <a href='{{ sitepath }}{{ selifpath }}{{ filename }}'>Download it instead</a>
 </video>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/paste.html b/templates/paste.html
index b22ca961..5c0ebdc5 100644
--- a/templates/paste.html
+++ b/templates/paste.html
@@ -2,6 +2,17 @@
 
 {% block title %}{{sitename}} - Paste{% endblock %}
 
+{% block opengraph %}
+<meta property="og:title" content="{{ sitename }} - Paste" />
+<meta property="og:type" content="website" />
+<meta property="og:url" content="{{ siteurl }}{{ sitepath }}{{ filename }}" />
+{% endblock %}
+
+{% block twittercard %}
+<meta name="twitter:card" content="summary" />
+<meta name="twitter:title" content="{{ sitename }} - Paste" />
+{% endblock %}
+
 {% block content %}
 <form id="reply" action='{{ sitepath }}upload' method='post'>
     <div id="main" class="paste">
@@ -38,4 +49,4 @@
 
 <script src="{{ sitepath }}static/js/util.js"></script>
 <script src="{{ sitepath }}static/js/paste.js"></script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
