diff --git a/expire.php b/expire.php
index 8e822852..17356ac4 100644
--- a/expire.php
+++ b/expire.php
@@ -130,6 +130,10 @@ foreach($delete as $i => $d){
 	// Delete entire board directory
 	rrmdir($board['uri'] . '/');
 	rrmdir('static/banners/' . $board['uri']);
+	// HAAAAAX
+	if($config['dir']['img_root'] != '')
+		rrmdir($config['dir']['img_root'] . $board['uri']);
+	
 	cache::delete('board_' . $board['uri']);
 	
 	_syslog(LOG_NOTICE, "Board deleted: {$board['uri']}");
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index afc83261..42ef6286 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -429,6 +429,9 @@ function mod_edit_board($boardName) {
 			
 			// Delete entire board directory
 			rrmdir($board['uri'] . '/');
+			// To reiterate: HAAAAAX
+			if($config['dir']['img_root'] != '')
+				rrmdir($config['dir']['img_root'] . $board['uri']);
 		} else {
 			$query = prepare('UPDATE ``boards`` SET `title` = :title, `subtitle` = :subtitle WHERE `uri` = :uri');
 			$query->bindValue(':uri', $board['uri']);