diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java
index 524d014a2..e80cccac1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java
@@ -18,6 +18,7 @@ import org.bukkit.craftbukkit.potion.CraftPotionType;
 import org.bukkit.craftbukkit.potion.CraftPotionUtil;
 import org.bukkit.entity.AreaEffectCloud;
 import org.bukkit.entity.LivingEntity;
+import org.bukkit.potion.PotionData;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.potion.PotionType;
@@ -191,6 +192,16 @@ public class CraftAreaEffectCloud extends CraftEntity implements AreaEffectCloud
         return true;
     }
 
+    @Override
+    public void setBasePotionData(PotionData data) {
+        setBasePotionType(CraftPotionUtil.fromBukkit(data));
+    }
+
+    @Override
+    public PotionData getBasePotionData() {
+        return CraftPotionUtil.toBukkit(getBasePotionType());
+    }
+
     @Override
     public void setBasePotionType(PotionType potionType) {
         if (potionType != null) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
index 4e4bf84ef..464d4c450 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
@@ -14,6 +14,7 @@ import org.bukkit.craftbukkit.potion.CraftPotionEffectType;
 import org.bukkit.craftbukkit.potion.CraftPotionType;
 import org.bukkit.craftbukkit.potion.CraftPotionUtil;
 import org.bukkit.entity.Arrow;
+import org.bukkit.potion.PotionData;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.potion.PotionType;
@@ -90,6 +91,16 @@ public class CraftArrow extends CraftAbstractArrow implements Arrow {
         return true;
     }
 
+    @Override
+    public void setBasePotionData(PotionData data) {
+        setBasePotionType(CraftPotionUtil.fromBukkit(data));
+    }
+
+    @Override
+    public PotionData getBasePotionData() {
+        return CraftPotionUtil.toBukkit(getBasePotionType());
+    }
+
     @Override
     public void setBasePotionType(PotionType potionType) {
         if (potionType != null) {
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java
index 64d4f305f..d04b9e384 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java
@@ -22,7 +22,9 @@ import org.bukkit.Material;
 import org.bukkit.configuration.serialization.DelegateDeserialization;
 import org.bukkit.craftbukkit.potion.CraftPotionEffectType;
 import org.bukkit.craftbukkit.potion.CraftPotionType;
+import org.bukkit.craftbukkit.potion.CraftPotionUtil;
 import org.bukkit.inventory.meta.PotionMeta;
+import org.bukkit.potion.PotionData;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.potion.PotionType;
@@ -160,6 +162,16 @@ class CraftMetaPotion extends CraftMetaItem implements PotionMeta {
         return clone;
     }
 
+    @Override
+    public void setBasePotionData(PotionData data) {
+        setBasePotionType(CraftPotionUtil.fromBukkit(data));
+    }
+
+    @Override
+    public PotionData getBasePotionData() {
+        return CraftPotionUtil.toBukkit(getBasePotionType());
+    }
+
     @Override
     public void setBasePotionType(PotionType potionType) {
         type = potionType;
diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
index ec39566bf..986e7fd65 100644
--- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
+++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
@@ -1,13 +1,81 @@
 package org.bukkit.craftbukkit.potion;
 
+import com.google.common.base.Preconditions;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.ImmutableBiMap;
 import net.minecraft.core.Holder;
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.effect.MobEffectList;
+import org.bukkit.potion.PotionData;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
+import org.bukkit.potion.PotionType;
 
 public class CraftPotionUtil {
 
+    private static final BiMap<PotionType, PotionType> upgradeable = ImmutableBiMap.<PotionType, PotionType>builder()
+            .put(PotionType.LEAPING, PotionType.STRONG_LEAPING)
+            .put(PotionType.SWIFTNESS, PotionType.STRONG_SWIFTNESS)
+            .put(PotionType.HEALING, PotionType.STRONG_HEALING)
+            .put(PotionType.HARMING, PotionType.STRONG_HARMING)
+            .put(PotionType.POISON, PotionType.STRONG_POISON)
+            .put(PotionType.REGENERATION, PotionType.STRONG_REGENERATION)
+            .put(PotionType.STRENGTH, PotionType.STRONG_STRENGTH)
+            .put(PotionType.SLOWNESS, PotionType.STRONG_SLOWNESS)
+            .put(PotionType.TURTLE_MASTER, PotionType.STRONG_TURTLE_MASTER)
+            .build();
+    private static final BiMap<PotionType, PotionType> extendable = ImmutableBiMap.<PotionType, PotionType>builder()
+            .put(PotionType.NIGHT_VISION, PotionType.LONG_NIGHT_VISION)
+            .put(PotionType.INVISIBILITY, PotionType.LONG_INVISIBILITY)
+            .put(PotionType.LEAPING, PotionType.LONG_LEAPING)
+            .put(PotionType.FIRE_RESISTANCE, PotionType.LONG_FIRE_RESISTANCE)
+            .put(PotionType.SWIFTNESS, PotionType.LONG_SWIFTNESS)
+            .put(PotionType.SLOWNESS, PotionType.LONG_SLOWNESS)
+            .put(PotionType.WATER_BREATHING, PotionType.LONG_WATER_BREATHING)
+            .put(PotionType.POISON, PotionType.LONG_POISON)
+            .put(PotionType.REGENERATION, PotionType.LONG_REGENERATION)
+            .put(PotionType.STRENGTH, PotionType.LONG_STRENGTH)
+            .put(PotionType.WEAKNESS, PotionType.LONG_WEAKNESS)
+            .put(PotionType.TURTLE_MASTER, PotionType.LONG_TURTLE_MASTER)
+            .put(PotionType.SLOW_FALLING, PotionType.LONG_SLOW_FALLING)
+            .build();
+
+    public static PotionType fromBukkit(PotionData data) {
+        if (data == null) {
+            return null;
+        }
+
+        PotionType type;
+        if (data.isUpgraded()) {
+            type = upgradeable.get(data.getType());
+        } else if (data.isExtended()) {
+            type = extendable.get(data.getType());
+        } else {
+            type = data.getType();
+        }
+        Preconditions.checkNotNull(type, "Unknown potion type from data " + data);
+
+        return type;
+    }
+
+    public static PotionData toBukkit(PotionType type) {
+        if (type == null) {
+            return null;
+        }
+
+        PotionType potionType;
+        potionType = extendable.inverse().get(type);
+        if (potionType != null) {
+            return new PotionData(potionType, true, false);
+        }
+        potionType = upgradeable.inverse().get(type);
+        if (potionType != null) {
+            return new PotionData(potionType, false, true);
+        }
+
+        return new PotionData(type, false, false);
+    }
+
     public static MobEffect fromBukkit(PotionEffect effect) {
         Holder<MobEffectList> type = CraftPotionEffectType.bukkitToMinecraftHolder(effect.getType());
         return new MobEffect(type, effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles());