diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/nls/GlobalBundleCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/nls/GlobalBundleCache.java
index c95689ccb..d880d9b61 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/nls/GlobalBundleCache.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/nls/GlobalBundleCache.java
@@ -82,6 +82,7 @@ class GlobalBundleCache {
 	 * @exception TranslationBundleLoadingException see {@link TranslationBundle#load(Locale)}
 	 * @exception TranslationStringMissingException see {@link TranslationBundle#load(Locale)}
 	 */
+	@SuppressWarnings("unchecked")
 	static synchronized <T extends TranslationBundle> T lookupBundle(Locale locale, Class<T> type) {
 		try {
 			Map<Class, TranslationBundle> bundles = cachedBundles.get(locale);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/AbstractPlotRenderer.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/AbstractPlotRenderer.java
index 0fac3af9b..6ba0dfed0 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/AbstractPlotRenderer.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/AbstractPlotRenderer.java
@@ -91,6 +91,7 @@ public abstract class AbstractPlotRenderer<TLane extends PlotLane, TColor> {
 	 * @param h
 	 *            total height (in pixels) of this cell.
 	 */
+	@SuppressWarnings("unchecked")
 	protected void paintCommit(final PlotCommit<TLane> commit, final int h) {
 		final int dotSize = computeDotSize(h);
 		final TLane myLane = commit.getLane();
@@ -114,7 +115,6 @@ public abstract class AbstractPlotRenderer<TLane extends PlotLane, TColor> {
 					LINE_WIDTH);
 
 			for (int i = 0; i < commit.mergingLanes.length; i++) {
-				@SuppressWarnings("unchecked")
 				final TLane pLane = (TLane) commit.mergingLanes[i];
 				final TColor pColor = laneColor(pLane);
 				final int cx = laneC(pLane);
@@ -138,7 +138,6 @@ public abstract class AbstractPlotRenderer<TLane extends PlotLane, TColor> {
 
 		if (commit.getChildCount() > 0) {
 			for (int i = 0; i < commit.forkingOffLanes.length; i++) {
-				@SuppressWarnings("unchecked")
 				final TLane childLane = (TLane) commit.forkingOffLanes[i];
 				final TColor cColor = laneColor(childLane);
 				final int cx = laneC(childLane);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommit.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommit.java
index dba68465c..2e8aab885 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommit.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommit.java
@@ -198,6 +198,7 @@ public class PlotCommit<L extends PlotLane> extends RevCommit {
 	 *
 	 * @return the assigned lane for this commit.
 	 */
+	@SuppressWarnings("unchecked")
 	public final L getLane() {
 		return (L) lane;
 	}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java
index 3444c8df1..6102a8148 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java
@@ -115,6 +115,7 @@ public class PlotCommitList<L extends PlotLane> extends
 	 * @param result
 	 *            collection to add the passing lanes into.
 	 */
+	@SuppressWarnings("unchecked")
 	public void findPassingThrough(final PlotCommit<L> currCommit,
 			final Collection<L> result) {
 		for (final PlotLane p : currCommit.passingLanes)
@@ -343,6 +344,7 @@ public class PlotCommitList<L extends PlotLane> extends
 		}
 	}
 
+	@SuppressWarnings("unchecked")
 	private void closeLane(PlotLane lane) {
 		if (activeLanes.remove(lane)) {
 			recycleLane((L) lane);
@@ -395,6 +397,7 @@ public class PlotCommitList<L extends PlotLane> extends
 	/**
 	 * @return a new Lane appropriate for this particular PlotList.
 	 */
+	@SuppressWarnings("unchecked")
 	protected L createLane() {
 		return (L) new PlotLane();
 	}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommitList.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommitList.java
index 835e0ce22..64f99bbd2 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommitList.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommitList.java
@@ -297,6 +297,7 @@ public class RevCommitList<E extends RevCommit> extends RevObjectList<E> {
 	 * @throws MissingObjectException
 	 *             see {@link RevWalk#next()}
 	 */
+	@SuppressWarnings("unchecked")
 	public void fillTo(final int highMark) throws MissingObjectException,
 			IncorrectObjectTypeException, IOException {
 		if (walker == null || size > highMark)
@@ -361,6 +362,7 @@ public class RevCommitList<E extends RevCommit> extends RevObjectList<E> {
 	 * @throws MissingObjectException
 	 *             see {@link RevWalk#next()}
 	 */
+	@SuppressWarnings("unchecked")
 	public void fillTo(final RevCommit commitToLoad, int highMark)
 			throws MissingObjectException, IncorrectObjectTypeException,
 			IOException {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObjectList.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObjectList.java
index a05cc9046..5052a4dea 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObjectList.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObjectList.java
@@ -87,6 +87,7 @@ public class RevObjectList<E extends RevObject> extends AbstractList<E> {
 		size++;
 	}
 
+	@SuppressWarnings("unchecked")
 	public E set(int index, E element) {
 		Block s = contents;
 		while (index >> s.shift >= BLOCK_SIZE) {
@@ -106,6 +107,7 @@ public class RevObjectList<E extends RevObject> extends AbstractList<E> {
 		return (E) old;
 	}
 
+	@SuppressWarnings("unchecked")
 	public E get(int index) {
 		Block s = contents;
 		if (index >> s.shift >= 1024)
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/Daemon.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/Daemon.java
index 89f0764a5..03f7c7283 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/Daemon.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/Daemon.java
@@ -103,6 +103,7 @@ public class Daemon {
 	 *            address to listen for connections on. If null, any available
 	 *            port will be chosen on all network interfaces.
 	 */
+	@SuppressWarnings("unchecked")
 	public Daemon(final InetSocketAddress addr) {
 		myAddress = addr;
 		processors = new ThreadGroup("Git-Daemon"); //$NON-NLS-1$