diff --git a/pom.xml b/pom.xml
index dc0db69..ca16216 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,7 @@
 		<dependency>
 			<groupId>com.rometools</groupId>
 			<artifactId>rome</artifactId>
+            <version>1.5.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-httpclient</groupId>
diff --git a/src/main/java/com/rometools/fetcher/FeedFetcher.java b/src/main/java/com/rometools/fetcher/FeedFetcher.java
index 32d307a..05f0868 100644
--- a/src/main/java/com/rometools/fetcher/FeedFetcher.java
+++ b/src/main/java/com/rometools/fetcher/FeedFetcher.java
@@ -19,8 +19,8 @@ package com.rometools.fetcher;
 import java.io.IOException;
 import java.net.URL;
 
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.FeedException;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.FeedException;
 
 public interface FeedFetcher {
     /**
@@ -101,7 +101,7 @@ public interface FeedFetcher {
      * Retrieve a feed over HTTP
      *
      * @param feedUrl A non-null URL of a RSS/Atom feed to retrieve
-     * @return A {@link com.sun.syndication.feed.synd.SyndFeed} object
+     * @return A {@link com.rometools.rome.feed.synd.SyndFeed} object
      * @throws IllegalArgumentException if the URL is null;
      * @throws IOException if a TCP error occurs
      * @throws FeedException if the feed is not valid
diff --git a/src/main/java/com/rometools/fetcher/FetcherEvent.java b/src/main/java/com/rometools/fetcher/FetcherEvent.java
index 26358de..6ed4a0c 100644
--- a/src/main/java/com/rometools/fetcher/FetcherEvent.java
+++ b/src/main/java/com/rometools/fetcher/FetcherEvent.java
@@ -2,7 +2,7 @@ package com.rometools.fetcher;
 
 import java.util.EventObject;
 
-import com.sun.syndication.feed.synd.SyndFeed;
+import com.rometools.rome.feed.synd.SyndFeed;
 
 /**
  * Implementation note: FetcherEvent is not thread safe. Make sure that they are only ever accessed
diff --git a/src/main/java/com/rometools/fetcher/impl/AbstractFeedFetcher.java b/src/main/java/com/rometools/fetcher/impl/AbstractFeedFetcher.java
index 6d5a1b1..7458253 100644
--- a/src/main/java/com/rometools/fetcher/impl/AbstractFeedFetcher.java
+++ b/src/main/java/com/rometools/fetcher/impl/AbstractFeedFetcher.java
@@ -32,7 +32,7 @@ import com.rometools.fetcher.FeedFetcher;
 import com.rometools.fetcher.FetcherEvent;
 import com.rometools.fetcher.FetcherException;
 import com.rometools.fetcher.FetcherListener;
-import com.sun.syndication.feed.synd.SyndFeed;
+import com.rometools.rome.feed.synd.SyndFeed;
 
 public abstract class AbstractFeedFetcher implements FeedFetcher {
 
diff --git a/src/main/java/com/rometools/fetcher/impl/HashMapFeedInfoCache.java b/src/main/java/com/rometools/fetcher/impl/HashMapFeedInfoCache.java
index 989ab91..e4d7442 100644
--- a/src/main/java/com/rometools/fetcher/impl/HashMapFeedInfoCache.java
+++ b/src/main/java/com/rometools/fetcher/impl/HashMapFeedInfoCache.java
@@ -114,7 +114,7 @@ public class HashMapFeedInfoCache implements FeedFetcherCache, Serializable {
     }
 
     /**
-     * @see com.sun.syndication.fetcher.impl.FeedFetcherCache#clear()
+     * @see com.rometools.rome.fetcher.impl.FeedFetcherCache#clear()
      */
     @Override
     public void clear() {
@@ -124,7 +124,7 @@ public class HashMapFeedInfoCache implements FeedFetcherCache, Serializable {
     }
 
     /**
-     * @see com.sun.syndication.fetcher.impl.FeedFetcherCache#remove(java.net.URL)
+     * @see com.rometools.rome.fetcher.impl.FeedFetcherCache#remove(java.net.URL)
      */
     @Override
     public SyndFeedInfo remove(final URL url) {
diff --git a/src/main/java/com/rometools/fetcher/impl/HttpClientFeedFetcher.java b/src/main/java/com/rometools/fetcher/impl/HttpClientFeedFetcher.java
index be38b11..67f99e7 100644
--- a/src/main/java/com/rometools/fetcher/impl/HttpClientFeedFetcher.java
+++ b/src/main/java/com/rometools/fetcher/impl/HttpClientFeedFetcher.java
@@ -36,10 +36,10 @@ import org.apache.commons.httpclient.params.HttpMethodParams;
 
 import com.rometools.fetcher.FetcherEvent;
 import com.rometools.fetcher.FetcherException;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.FeedException;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.XmlReader;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.FeedException;
+import com.rometools.rome.io.SyndFeedInput;
+import com.rometools.rome.io.XmlReader;
 
 /**
  * @author Nick Lothian
diff --git a/src/main/java/com/rometools/fetcher/impl/HttpURLFeedFetcher.java b/src/main/java/com/rometools/fetcher/impl/HttpURLFeedFetcher.java
index 9255f61..c154e32 100644
--- a/src/main/java/com/rometools/fetcher/impl/HttpURLFeedFetcher.java
+++ b/src/main/java/com/rometools/fetcher/impl/HttpURLFeedFetcher.java
@@ -26,10 +26,10 @@ import java.util.zip.GZIPInputStream;
 
 import com.rometools.fetcher.FetcherEvent;
 import com.rometools.fetcher.FetcherException;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.FeedException;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.XmlReader;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.FeedException;
+import com.rometools.rome.io.SyndFeedInput;
+import com.rometools.rome.io.XmlReader;
 
 /**
  * <p>
@@ -103,7 +103,7 @@ public class HttpURLFeedFetcher extends AbstractFeedFetcher {
      * Retrieve a feed over HTTP
      *
      * @param feedUrl A non-null URL of a RSS/Atom feed to retrieve
-     * @return A {@link com.sun.syndication.feed.synd.SyndFeed} object
+     * @return A {@link com.rometools.rome.feed.synd.SyndFeed} object
      * @throws IllegalArgumentException if the URL is null;
      * @throws IOException if a TCP error occurs
      * @throws FeedException if the feed is not valid
diff --git a/src/main/java/com/rometools/fetcher/impl/SyndFeedInfo.java b/src/main/java/com/rometools/fetcher/impl/SyndFeedInfo.java
index 4b9d604..07c9bfe 100644
--- a/src/main/java/com/rometools/fetcher/impl/SyndFeedInfo.java
+++ b/src/main/java/com/rometools/fetcher/impl/SyndFeedInfo.java
@@ -19,12 +19,12 @@ package com.rometools.fetcher.impl;
 import java.io.Serializable;
 import java.net.URL;
 
-import com.sun.syndication.feed.impl.ObjectBean;
-import com.sun.syndication.feed.synd.SyndFeed;
+import com.rometools.rome.feed.impl.ObjectBean;
+import com.rometools.rome.feed.synd.SyndFeed;
 
 /**
  * <p>
- * A class to represent a {@link com.sun.syndication.feed.synd.SyndFeed} and some useful information
+ * A class to represent a {@link com.rometools.rome.feed.synd.SyndFeed} and some useful information
  * about it.
  * </p>
  *
diff --git a/src/main/java/com/rometools/fetcher/samples/FeedAggregator.java b/src/main/java/com/rometools/fetcher/samples/FeedAggregator.java
index 8af007f..da0e870 100644
--- a/src/main/java/com/rometools/fetcher/samples/FeedAggregator.java
+++ b/src/main/java/com/rometools/fetcher/samples/FeedAggregator.java
@@ -25,10 +25,10 @@ import com.rometools.fetcher.FeedFetcher;
 import com.rometools.fetcher.impl.FeedFetcherCache;
 import com.rometools.fetcher.impl.HashMapFeedInfoCache;
 import com.rometools.fetcher.impl.HttpURLFeedFetcher;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.feed.synd.SyndFeedImpl;
-import com.sun.syndication.io.SyndFeedOutput;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.feed.synd.SyndFeedImpl;
+import com.rometools.rome.io.SyndFeedOutput;
 
 /**
  * <p>
diff --git a/src/main/java/com/rometools/fetcher/samples/FeedReader.java b/src/main/java/com/rometools/fetcher/samples/FeedReader.java
index 4dc92f7..2aebae3 100644
--- a/src/main/java/com/rometools/fetcher/samples/FeedReader.java
+++ b/src/main/java/com/rometools/fetcher/samples/FeedReader.java
@@ -25,7 +25,7 @@ import com.rometools.fetcher.FetcherListener;
 import com.rometools.fetcher.impl.FeedFetcherCache;
 import com.rometools.fetcher.impl.HashMapFeedInfoCache;
 import com.rometools.fetcher.impl.HttpURLFeedFetcher;
-import com.sun.syndication.feed.synd.SyndFeed;
+import com.rometools.rome.feed.synd.SyndFeed;
 
 /**
  * Reads and prints any RSS/Atom feed type. Converted from the original Rome sample FeedReader
@@ -81,7 +81,7 @@ public class FeedReader {
 
     static class FetcherEventListenerImpl implements FetcherListener {
         /**
-         * @see com.sun.syndication.fetcher.FetcherListener#fetcherEvent(com.sun.syndication.fetcher.FetcherEvent)
+         * @see com.rometools.rome.fetcher.FetcherListener#fetcherEvent(com.rometools.rome.fetcher.FetcherEvent)
          */
         @Override
         public void fetcherEvent(final FetcherEvent event) {
diff --git a/src/site/apt/ChangeLog.apt b/src/site/apt/ChangeLog.apt
index aafacf6..135af0c 100644
--- a/src/site/apt/ChangeLog.apt
+++ b/src/site/apt/ChangeLog.apt
@@ -93,7 +93,7 @@ Change Log
 *Prior to 1.0RC2
 
  [[1]] BeanInfo class added for AbstractFeedFetcher\
- com.sun.syndication.fetcher.impl.AbstractFeedFetcherBeanInfo was created to allow introspection to correctly find the events
+ com.rometools.rome.fetcher.impl.AbstractFeedFetcherBeanInfo was created to allow introspection to correctly find the events
 
  [[1]] Callback to allow access to HttpClient HttpMethod object\
  Add a HttpClientMethodCallbackIntf to allow the calling code to modify the HttpClient HttpMethod used to make the request
diff --git a/src/test/java/com/rometools/test/AbstractJettyTest.java b/src/test/java/com/rometools/test/AbstractJettyTest.java
index a8d1a1f..22427f6 100644
--- a/src/test/java/com/rometools/test/AbstractJettyTest.java
+++ b/src/test/java/com/rometools/test/AbstractJettyTest.java
@@ -38,9 +38,9 @@ import com.rometools.fetcher.FetcherException;
 import com.rometools.fetcher.FetcherListener;
 import com.rometools.fetcher.impl.FeedFetcherCache;
 import com.rometools.fetcher.impl.HashMapFeedInfoCache;
-import com.sun.syndication.feed.atom.Entry;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
+import com.rometools.rome.feed.atom.Entry;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
 
 /**
  * @author nl
@@ -145,7 +145,7 @@ public abstract class AbstractJettyTest extends TestCase {
         }
 
         /**
-         * @see com.sun.syndication.fetcher.FetcherListener#fetcherEvent(com.sun.syndication.fetcher.FetcherEvent)
+         * @see com.rometools.rome.fetcher.FetcherListener#fetcherEvent(com.rometools.rome.fetcher.FetcherEvent)
          */
         @Override
         public void fetcherEvent(final FetcherEvent event) {
diff --git a/src/test/java/com/rometools/test/FetcherTestServlet.java b/src/test/java/com/rometools/test/FetcherTestServlet.java
index cabc476..02dc19b 100644
--- a/src/test/java/com/rometools/test/FetcherTestServlet.java
+++ b/src/test/java/com/rometools/test/FetcherTestServlet.java
@@ -34,14 +34,14 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.sun.syndication.feed.synd.SyndContent;
-import com.sun.syndication.feed.synd.SyndContentImpl;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndEntryImpl;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.feed.synd.SyndFeedImpl;
-import com.sun.syndication.io.FeedException;
-import com.sun.syndication.io.SyndFeedOutput;
+import com.rometools.rome.feed.synd.SyndContent;
+import com.rometools.rome.feed.synd.SyndContentImpl;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndEntryImpl;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.feed.synd.SyndFeedImpl;
+import com.rometools.rome.io.FeedException;
+import com.rometools.rome.io.SyndFeedOutput;
 
 public class FetcherTestServlet extends HttpServlet {
 
diff --git a/src/test/java/com/rometools/test/HttpClientFeedFetcherTest.java b/src/test/java/com/rometools/test/HttpClientFeedFetcherTest.java
index fbc9f13..95f0c08 100644
--- a/src/test/java/com/rometools/test/HttpClientFeedFetcherTest.java
+++ b/src/test/java/com/rometools/test/HttpClientFeedFetcherTest.java
@@ -33,7 +33,7 @@ public class HttpClientFeedFetcherTest extends AbstractJettyTest {
     }
 
     /**
-     * @see com.sun.syndication.fetcher.impl.AbstractJettyTest#getFeedFetcher()
+     * @see com.rometools.rome.fetcher.impl.AbstractJettyTest#getFeedFetcher()
      */
     @Override
     protected FeedFetcher getFeedFetcher() {
@@ -46,7 +46,7 @@ public class HttpClientFeedFetcherTest extends AbstractJettyTest {
     }
 
     /**
-     * @see com.sun.syndication.fetcher.impl.AbstractJettyTest#getAuthenticatedFeedFetcher()
+     * @see com.rometools.rome.fetcher.impl.AbstractJettyTest#getAuthenticatedFeedFetcher()
      */
     @Override
     public FeedFetcher getAuthenticatedFeedFetcher() {
diff --git a/src/test/java/com/rometools/test/HttpURLFeedFetcherTest.java b/src/test/java/com/rometools/test/HttpURLFeedFetcherTest.java
index 69d5b61..fe36217 100644
--- a/src/test/java/com/rometools/test/HttpURLFeedFetcherTest.java
+++ b/src/test/java/com/rometools/test/HttpURLFeedFetcherTest.java
@@ -27,7 +27,7 @@ public class HttpURLFeedFetcherTest extends AbstractJettyTest {
     }
 
     /**
-     * @see com.sun.syndication.fetcher.impl.AbstractJettyTest#getFeedFetcher()
+     * @see com.rometools.rome.fetcher.impl.AbstractJettyTest#getFeedFetcher()
      */
     @Override
     protected FeedFetcher getFeedFetcher() {
@@ -40,7 +40,7 @@ public class HttpURLFeedFetcherTest extends AbstractJettyTest {
     }
 
     /**
-     * @see com.sun.syndication.fetcher.impl.AbstractJettyTest#getAuthenticatedFeedFetcher()
+     * @see com.rometools.rome.fetcher.impl.AbstractJettyTest#getAuthenticatedFeedFetcher()
      */
     @Override
     public FeedFetcher getAuthenticatedFeedFetcher() {