diff --git a/images/audio.gif b/images/audio.gif
new file mode 100644
index 000000000..4be977116
Binary files /dev/null and b/images/audio.gif differ
diff --git a/images/video.gif b/images/video.gif
new file mode 100644
index 000000000..e4d5e8cdd
Binary files /dev/null and b/images/video.gif differ
diff --git a/mod/network.php b/mod/network.php
index 1f92145d1..ad028df1f 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -92,6 +92,8 @@ function network_content(&$a, $update = 0) {
 			'$upload' => t('Upload photo'),
 			'$weblink' => t('Insert web link'),
 			'$youtube' => t('Insert YouTube video'),
+			'$video' => t('Insert Vorbis [.ogg] video'),
+			'$audio' => t('Insert Vorbis [.ogg] audio'),
 			'$setloc' => t('Set your location'),
 			'$noloc' => t('Clear browser location'),
 			'$wait' => t('Please wait'),
diff --git a/mod/profile.php b/mod/profile.php
index 3354bc9a3..a464b7c06 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -157,6 +157,8 @@ function profile_content(&$a, $update = 0) {
 				'$upload' => t('Upload photo'),
 				'$weblink' => t('Insert web link'),
 				'$youtube' => t('Insert YouTube video'),
+				'$video' => t('Insert Vorbis [.ogg] video'),
+				'$audio' => t('Insert Vorbis [.ogg] audio'),
 				'$setloc' => t('Set your location'),
 				'$noloc' => t('Clear browser location'),
 				'$wait' => t('Please wait'),
diff --git a/view/de/jot-header.tpl b/view/de/jot-header.tpl
index 25d28c3a7..62fbe84e4 100644
--- a/view/de/jot-header.tpl
+++ b/view/de/jot-header.tpl
@@ -104,6 +104,20 @@ tinyMCE.init({
 		}
 	}
 
+	function jotVideoURL() {
+		reply = prompt("Please enter a video(.ogg) link/URL:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("Please enter an audio(.ogg) link/URL:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
+		}
+	}
+
 	function jotGetLocation() {
 		reply = prompt("Wo bist du im Moment?", $('#jot-location').val());
 		if(reply && reply.length) {
diff --git a/view/en/jot-header.tpl b/view/en/jot-header.tpl
index 20f84b851..d73fe7d62 100644
--- a/view/en/jot-header.tpl
+++ b/view/en/jot-header.tpl
@@ -104,6 +104,21 @@ tinyMCE.init({
 		}
 	}
 
+	function jotVideoURL() {
+		reply = prompt("Please enter a video(.ogg) link/URL:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("Please enter an audio(.ogg) link/URL:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
+		}
+	}
+
+
 	function jotGetLocation() {
 		reply = prompt("Where are you right now?", $('#jot-location').val());
 		if(reply && reply.length) {
diff --git a/view/fr/jot-header.tpl b/view/fr/jot-header.tpl
index a4c5f42a4..b1b6dacf0 100644
--- a/view/fr/jot-header.tpl
+++ b/view/fr/jot-header.tpl
@@ -103,6 +103,20 @@ tinyMCE.init({
 		}
 	}
 
+	function jotVideoURL() {
+		reply = prompt("Please enter a video(.ogg) link/URL:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("Please enter an audio(.ogg) link/URL:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
+		}
+	}
+
 	function jotGetLocation() {
 		reply = prompt("Where are you right now?", $('#jot-location').val());
 		if(reply && reply.length) {
diff --git a/view/it/jot-header.tpl b/view/it/jot-header.tpl
index ff28def61..8ca5a0717 100644
--- a/view/it/jot-header.tpl
+++ b/view/it/jot-header.tpl
@@ -104,6 +104,20 @@ tinyMCE.init({
 		}
 	}
 
+	function jotVideoURL() {
+		reply = prompt("Please enter a video(.ogg) link/URL:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("Please enter an audio(.ogg) link/URL:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
+		}
+	}
+
 	function jotGetLocation() {
 		reply = prompt("Dove ti trovi ora?", $('#jot-location').val());
 		if(reply && reply.length) {
diff --git a/view/jot.tpl b/view/jot.tpl
index 68139ddc0..fd85b9267 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -26,7 +26,13 @@
 		<img id="profile-link" src="images/link-icon.gif" alt="$weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" />
 	</div> 
 	<div id="profile-youtube-wrapper" style="display: $visitor;" >
-		<img id="profile-video" src="images/youtube_icon.gif" alt="$youtube" title="$youtube" onclick="jotGetVideo();" />
+		<img id="profile-youtube" src="images/youtube_icon.gif" alt="$youtube" title="$youtube" onclick="jotGetVideo();" />
+	</div> 
+	<div id="profile-video-wrapper" style="display: $visitor;" >
+		<img id="profile-video" src="images/video.gif" alt="$video" title="$video" onclick="jotVideoURL();" />
+	</div> 
+	<div id="profile-audio-wrapper" style="display: $visitor;" >
+		<img id="profile-audio" src="images/audio.gif" alt="$audio" title="$audio" onclick="jotAudioURL();" />
 	</div> 
 	<div id="profile-location-wrapper" style="display: $visitor;" >
 		<img id="profile-location" src="images/globe.gif" alt="$setloc" title="$setloc" onclick="jotGetLocation();" />
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index ad2aac9be..ce75655fb 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -206,8 +206,10 @@ div.wall-item-content-wrapper.shiny {
 /* from default */
 #jot-perms-icon, 
 #profile-location,
-#profile-nolocation, 
+#profile-nolocation,
+#profile-youtube, 
 #profile-video, 
+#profile-audio,
 #profile-link, 
 #wall-image-upload,
 #profile-upload-wrapper,
@@ -1056,6 +1058,14 @@ input#dfrn-url {
 	float: left;
 	margin-left: 20px;
 }
+#profile-video-wrapper {
+	float: left;
+	margin-left: 20px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 20px;
+}
 #profile-location-wrapper {
 	float: left;
 	margin-left: 20px;
@@ -1067,7 +1077,7 @@ input#dfrn-url {
 
 #profile-jot-perms {
 	float: left;
-	margin-left: 200px;
+	margin-left: 150px;
 	font-weight: bold;
 	font-size: 1.2em;
 }
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 13c2dda27..1c378793a 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -107,8 +107,10 @@ blockquote:before {
 
 #jot-perms-icon, 
 #profile-location,
-#profile-nolocation, 
-#profile-video, 
+#profile-nolocation,
+#profile-youtube, 
+#profile-video,
+#profile-audio, 
 #profile-link, 
 #wall-image-upload,
 #profile-upload-wrapper,
@@ -1125,6 +1127,14 @@ padding: 5px 10px 0px;
 	float: left;
 	margin-left: 20px;
 }
+#profile-video-wrapper {
+	float: left;
+	margin-left: 20px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 20px;
+}
 #profile-location-wrapper {
 	float: left;
 	margin-left: 20px;
@@ -1136,7 +1146,7 @@ padding: 5px 10px 0px;
 
 #profile-jot-perms {
 	float: left;
-	margin-left: 200px;
+	margin-left: 150px;
 	font-weight: bold;
 	font-size: 1.2em;
 }