diff --git a/conf/icecast.xml b/conf/icecast.xml
index d343ddff..e9eafaf3 100644
--- a/conf/icecast.xml
+++ b/conf/icecast.xml
@@ -1,6 +1,6 @@
 <icecast>
-	<location>Jack's House</location>
-	<admin>jack@icecast.org</admin>
+	<location>Not Currently Used</location>
+	<admin>Not Currently Used</admin>
 
 	<limits>
 		<clients>100</clients>
@@ -14,42 +14,38 @@
 	<source-password>hackme</source-password>
 	<relay-password>hackme</relay-password>
 
-	<directory>
-		<touch-freq>5</touch-freq>
-		<server>
-			<host>yp.icecast.org</host>
-			<touch-freq>15</touch-freq>
-		</server>
-	</directory>
+        <directory>
+                <yp-url>http://www.oddsock.org/cgi-bin/yp-cgi</yp-url>
+        </directory>
 
-	<hostname>i.cantcode.com</hostname>
+	<hostname>localhost</hostname>
 	<port>8000</port>
-	<!--<bind-address>127.0.0.1</bind-address>-->
 
+	<!--<bind-address>127.0.0.1</bind-address>-->
 	<!--<master-server>127.0.0.1</master-server>-->
 	<!--<master-server-port>8001</master-server-port>-->
-    <!--<master-update-interval>120</master-update-interval>-->
-    <!--<master-password>hackme</master-password>-->
+	<!--<master-update-interval>120</master-update-interval>-->
+	<!--<master-password>hackme</master-password>-->
 
-    <fileserve>1</fileserve>
+	<fileserve>1</fileserve>
 
-    <paths>
-            <basedir>/usr/local/icecast</basedir>
-            <logdir>/tmp</logdir>
-            <webroot>/usr/local/icecast/web</webroot>
-    </paths>
+	<paths>
+		<basedir>/usr/local/icecast2</basedir>
+		<logdir>/usr/local/icecast2/logs</logdir>
+		<webroot>/usr/local/icecast2/web</webroot>
+	</paths>
 
 	<logging>
 		<accesslog>access.log</accesslog>
 		<errorlog>error.log</errorlog>
-        <loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+        	<loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
 	</logging>
 
-    <security>
-        <chroot>0</chroot>
-<!--    <changeowner>
-            <user>nobody</user>
-            <group>nogroup</group>
-        </changeowner>  -->
-    </security>
+	<security>
+		<chroot>0</chroot>
+<!--		<changeowner>
+			<user>nobody</user>
+			<group>nogroup</group>
+		</changeowner>  -->
+	</security>
 </icecast>