diff --git a/src/main/java/com/michaelbaranov/microba/calendar/ui/basic/ClassicCalendarPanel.java b/src/main/java/com/michaelbaranov/microba/calendar/ui/basic/ClassicCalendarPanel.java
index 2a6dd22..f8cf29d 100644
--- a/src/main/java/com/michaelbaranov/microba/calendar/ui/basic/ClassicCalendarPanel.java
+++ b/src/main/java/com/michaelbaranov/microba/calendar/ui/basic/ClassicCalendarPanel.java
@@ -56,6 +56,8 @@ class ClassicCalendarPanel extends JPanel implements
 
 	private JButton fastNextButton;
 
+	private static final int JAVA_MAJOR_VERSION = Integer.parseInt(System.getProperty("java.version").split("\\.|_|-b")[1]);
+
 	public ClassicCalendarPanel(Date aDate, Locale aLocale, TimeZone zone) {
 		this.locale = aLocale;
 		this.zone = zone;
@@ -159,7 +161,7 @@ private void createLocaleAndZoneSensitive() {
 		} else
 			calendar = Calendar.getInstance(zone, locale);
 
-		format = new SimpleDateFormat("MMMMM yyyy", locale);
+		format = new SimpleDateFormat(JAVA_MAJOR_VERSION >= 8 ? "LLLL yyyy" : "MMMMM yyyy", locale);
 		format.setTimeZone(zone);
 
 		setPreferredLabelSize();
diff --git a/src/main/java/com/michaelbaranov/microba/calendar/ui/basic/MonthComboBoxRenderer.java b/src/main/java/com/michaelbaranov/microba/calendar/ui/basic/MonthComboBoxRenderer.java
index 6a90cda..0503d02 100644
--- a/src/main/java/com/michaelbaranov/microba/calendar/ui/basic/MonthComboBoxRenderer.java
+++ b/src/main/java/com/michaelbaranov/microba/calendar/ui/basic/MonthComboBoxRenderer.java
@@ -17,10 +17,12 @@ class MonthComboBoxRenderer extends DefaultListCellRenderer {
 
 	private SimpleDateFormat dateFormat;
 
+	private static final int JAVA_MAJOR_VERSION = Integer.parseInt(System.getProperty("java.version").split("\\.|_|-b")[1]);
+
 	public MonthComboBoxRenderer(Locale locale, TimeZone zone) {
 		// this.locale = locale;
 		this.zone = zone;
-		dateFormat = new SimpleDateFormat("MMMM", locale);
+		dateFormat = new SimpleDateFormat(JAVA_MAJOR_VERSION >= 8 ? "LLLL" : "MMMM", locale);
 		dateFormat.setTimeZone(zone);
 	}
 
@@ -37,7 +39,7 @@ public Component getListCellRendererComponent(JList list, Object value,
 
 	public void setLocale(Locale locale) {
 		// this.locale = locale;
-		dateFormat = new SimpleDateFormat("MMMM", locale);
+		dateFormat = new SimpleDateFormat(JAVA_MAJOR_VERSION >= 8 ? "LLLL" : "MMMM", locale);
 		dateFormat.setTimeZone(zone);
 	}