diff --git a/dissociated-press.inc.php b/dissociated-press.inc.php
index 5bafd79..cd53776 100644
--- a/dissociated-press.inc.php
+++ b/dissociated-press.inc.php
@@ -178,7 +178,7 @@ function ProcessText($text, $directory){
 				}
 			}
 
-			return '<a href="' . $directory . '/' . $link . '">' . $text . '</a> ';
+			return '<a href="' . htmlentities($directory) . '/' . $link . '">' . $text . '</a> ';
 		}else{
 			return "$text";
 		}
diff --git a/index.php b/index.php
index 00f713a..fb9242b 100644
--- a/index.php
+++ b/index.php
@@ -102,7 +102,7 @@
 ?>
 
 <link rel="stylesheet" type="text/css" href="<?php print $config['web_path']; ?>/labyrinth.css">
-<title><?php print basename($_SERVER['REQUEST_URI']); ?></title>
+<title><?php print htmlentities(basename($_SERVER['REQUEST_URI'])); ?></title>
 <body>
 	<?php 
 		// Print the text with links
