diff --git a/.classpath b/.classpath
index 6d50dd6a..3c097fbc 100644
--- a/.classpath
+++ b/.classpath
@@ -3,9 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/fred"/>
-	<classpathentry kind="lib" path="/fred/lib/freenet-ext.jar"/>
-	<classpathentry kind="lib" path="lib/SnakeYAML-1.3.jar"/>
-	<classpathentry kind="lib" path="/usr/share/java/junit.jar"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/build.xml b/build.xml
index abac33c6..708dc05e 100644
--- a/build.xml
+++ b/build.xml
@@ -64,15 +64,16 @@
 		<delete dir="${tmp}"/>
 	</target>
 
-	<property name="SnakeYAML.mirror" value="http://snakeyamlrepo.appspot.com/repository/org/yaml/snakeyaml/1.5/snakeyaml-1.5.jar" />
-	<property name="SnakeYAML.md5" value="1788db5d529a981b090632b8e49b8cd2" />
-	<property name="SnakeYAML.sha" value="a3654035d0b68db775034afa5425a62250de8184" />
+	<property name="SnakeYAML.mirror" value="http://repo2.maven.org/maven2/org/yaml/snakeyaml/1.10/snakeyaml-1.10.jar" />
+        <property name="SnakeYAML.name" value="snakeyaml-1.10.jar" />
+        <property name="SnakeYAML.md5" value="5f1bbedd96c3a745fda676e3d653efd5" />
+	<property name="SnakeYAML.sha" value="032634ca71ed45db1a7f6b0f9e24c648466b40f1" />
 	<available property="SnakeYAML.exist" classname="org.yaml.snakeyaml.Yaml" classpathref="lib.path"/>
 	<target name="SnakeYAML-get" unless="SnakeYAML.exist">
-		<get verbose="true" src="${SnakeYAML.mirror}" dest="${tmp}/snakeyaml-1.5.jar" />
-		<checksum file="${tmp}/snakeyaml-1.5.jar" algorithm="MD5" property="${SnakeYAML.md5}" verifyProperty="SnakeYAMLMD5ok" />
-		<checksum file="${tmp}/snakeyaml-1.5.jar" algorithm="SHA" property="${SnakeYAML.sha}" verifyProperty="SnakeYAMLSHAok" />
-		<fail message="SnakeYAML.zip checksum mismatch">
+            <get verbose="true" src="${SnakeYAML.mirror}" dest="${tmp}/${SnakeYAML.name}" />
+            <checksum file="${tmp}/${SnakeYAML.name}" algorithm="MD5" property="${SnakeYAML.md5}" verifyProperty="SnakeYAMLMD5ok" />
+            <checksum file="${tmp}/${SnakeYAML.name}" algorithm="SHA" property="${SnakeYAML.sha}" verifyProperty="SnakeYAMLSHAok" />
+		<fail message="SnakeYAML.jar checksum mismatch">
 			<condition>
 				<or>
 					<equals arg1="${SnakeYAMLMD5ok}" arg2="false" />
@@ -80,7 +81,7 @@
 				</or>
 			</condition>
 		</fail>
-		<move file="${tmp}/snakeyaml-1.5.jar" todir="lib/" />
+                <move file="${tmp}/${SnakeYAML.name}" todir="lib/" />
 	</target>
 
 	<!--<property name="KeyExplorer.mirror" value="http://cloud.github.com/downloads/freenet/plugin-Library-staging/KeyExplorer-dacfafecbc82aecdeffa56bef4a047a7f6c7f08d.jar" />
@@ -234,7 +235,7 @@
 			</fileset>
 			<link href="http://java.sun.com/j2se/1.5.0/docs/api"/>
 			<link href="http://freenet.github.com/fred-staging/api"/>
-			<link href="http://snakeyamlrepo.appspot.com/releases/1.5/site/apidocs"/>
+			<link href="http://repo2.maven.org/maven2/org/yaml/snakeyaml/1.10/snakeyaml-1.10-javadoc.jar"/>
 		</javadoc>
 	</target>
 
diff --git a/src/plugins/Library/io/YamlReaderWriter.java b/src/plugins/Library/io/YamlReaderWriter.java
index 4c3118e6..fc60cae9 100644
--- a/src/plugins/Library/io/YamlReaderWriter.java
+++ b/src/plugins/Library/io/YamlReaderWriter.java
@@ -15,6 +15,7 @@
 import org.yaml.snakeyaml.representer.Represent;
 import org.yaml.snakeyaml.nodes.Node;
 import org.yaml.snakeyaml.nodes.ScalarNode;
+import org.yaml.snakeyaml.nodes.Tag;
 import org.yaml.snakeyaml.nodes.MappingNode;
 import org.yaml.snakeyaml.constructor.Constructor;
 import org.yaml.snakeyaml.constructor.AbstractConstruct;
@@ -58,7 +59,7 @@ public class YamlReaderWriter
 
 	final public static String MIME_TYPE = "text/yaml";
 	final public static String FILE_EXTENSION = ".yml";
-	
+
 	final static int MAX_PARALLEL = 1; // Limited by memory mainly. If memory is no object it could be limited by threads.
 	// Each Yaml instance uses a *significant* amount of memory...
 	static final Semaphore parallelLimiter = new Semaphore(MAX_PARALLEL);
@@ -89,7 +90,7 @@ public YamlReaderWriter() {
 	}
 
 	/** We do NOT keep this thread-local, because the Composer is only cleared after
-	 * the next call to load(), so it can persist with a lot of useless data if we 
+	 * the next call to load(), so it can persist with a lot of useless data if we
 	 * then use a different thread. So lets just construct them as needed. */
 	private Yaml makeYAML() {
 		DumperOptions opt = new DumperOptions();
@@ -122,14 +123,14 @@ public static class ExtendedRepresenter extends Representer {
 		public ExtendedRepresenter() {
 			this.representers.put(FreenetURI.class, new Represent() {
 				/*@Override**/ public Node representData(Object data) {
-					return representScalar("!FreenetURI", ((FreenetURI) data).toString());
+					return representScalar(new Tag("!FreenetURI"), ((FreenetURI) data).toString());
 				}
 			});
 			this.representers.put(Packer.BinInfo.class, new Represent() {
 				/*@Override**/ public Node representData(Object data) {
 					Packer.BinInfo inf = (Packer.BinInfo)data;
 					Map<Object, Object> map = Collections.<Object, Object>singletonMap(inf.getID(), inf.getWeight());
-					return representMapping("!BinInfo", map, true);
+					return representMapping(new Tag("!BinInfo"), map, true);
 				}
 			});
 			this.representers.put(TermTermEntry.class, new RepresentTermEntry(tebp_term));
@@ -148,7 +149,7 @@ public RepresentTermEntry(ObjectBlueprint<T> bp) {
 			}
 
 			/*@Override**/ public Node representData(Object data) {
-				return representMapping(tag, blueprint.objectAsMap((T)data), true);
+				return representMapping(new Tag(tag), blueprint.objectAsMap((T)data), true);
 			}
 
 		}
@@ -161,7 +162,7 @@ public RepresentTermEntry(ObjectBlueprint<T> bp) {
 	*/
 	public static class ExtendedConstructor extends Constructor {
 		public ExtendedConstructor() {
-			this.yamlConstructors.put("!FreenetURI", new AbstractConstruct() {
+			this.yamlConstructors.put(new Tag("!FreenetURI"), new AbstractConstruct() {
 				/*@Override**/ public Object construct(Node node) {
 					String uri = (String) constructScalar((ScalarNode)node);
 					try {
@@ -171,7 +172,7 @@ public ExtendedConstructor() {
 					}
 				}
 			});
-			this.yamlConstructors.put("!BinInfo", new AbstractConstruct() {
+			this.yamlConstructors.put(new Tag("!BinInfo"), new AbstractConstruct() {
 				/*@Override**/ public Object construct(Node node) {
 					Map<?, ?> map = (Map) constructMapping((MappingNode)node);
 					if (map.size() != 1) {
@@ -183,9 +184,9 @@ public ExtendedConstructor() {
 					throw new AssertionError();
 				}
 			});
-			this.yamlConstructors.put("!TermTermEntry", new ConstructTermEntry(tebp_term));
-			this.yamlConstructors.put("!TermIndexEntry", new ConstructTermEntry(tebp_index));
-			this.yamlConstructors.put("!TermPageEntry", new ConstructTermEntry(tebp_page));
+			this.yamlConstructors.put(new Tag("!TermTermEntry"), new ConstructTermEntry(tebp_term));
+			this.yamlConstructors.put(new Tag("!TermIndexEntry"), new ConstructTermEntry(tebp_index));
+			this.yamlConstructors.put(new Tag("!TermPageEntry"), new ConstructTermEntry(tebp_page));
 		}
 
 		public class ConstructTermEntry<T extends TermEntry> extends AbstractConstruct {
diff --git a/test/plugins/Library/io/serial/YamlMapTest.java b/test/plugins/Library/io/serial/YamlMapTest.java
index 414e8a21..08d41eb5 100644
--- a/test/plugins/Library/io/serial/YamlMapTest.java
+++ b/test/plugins/Library/io/serial/YamlMapTest.java
@@ -15,6 +15,7 @@
 import org.yaml.snakeyaml.representer.Represent;
 import org.yaml.snakeyaml.nodes.Node;
 import org.yaml.snakeyaml.nodes.ScalarNode;
+import org.yaml.snakeyaml.nodes.Tag;
 import org.yaml.snakeyaml.nodes.MappingNode;
 import org.yaml.snakeyaml.constructor.Constructor;
 import org.yaml.snakeyaml.constructor.Construct;
@@ -100,7 +101,7 @@ public ExtendedRepresenter() {
 
 		private class RepresentCustom implements Represent {
 			public Node representData(Object data) {
-				return representScalar("!Custom", ((Custom) data).toString());
+				return representScalar(new Tag("!Custom"), ((Custom) data).toString());
 			}
 		}
 	}
@@ -108,7 +109,7 @@ public Node representData(Object data) {
 
 	public static class ExtendedConstructor extends Constructor {
 		public ExtendedConstructor() {
-			this.yamlConstructors.put("!Custom", new ConstructCustom());
+			this.yamlConstructors.put(new Tag("!Custom"), new ConstructCustom());
 		}
 
 		private class ConstructCustom implements Construct {