diff --git a/pylintrc b/pylintrc
index 5fa3655..75d7647 100644
--- a/pylintrc
+++ b/pylintrc
@@ -2,14 +2,14 @@
 # ** DO NOT EDIT THIS FILE **
 # ***************************
 #
-# This file was generated by edx-lint: https://github.com/edx/edx-lint
+# This file was generated by edx-lint: https://github.com/openedx/edx-lint
 #
 # If you want to change this file, you have two choices, depending on whether
 # you want to make a local change that applies only to this repo, or whether
 # you want to make a central change that applies to all repos using edx-lint.
 #
 # Note: If your pylintrc file is simply out-of-date relative to the latest
-# pylintrc rules in edx-lint, ensure you have the latest edx-lint installed
+# pylintrc in edx-lint, ensure you have the latest edx-lint installed
 # and then follow the steps for a "LOCAL CHANGE".
 #
 # LOCAL CHANGE:
@@ -28,7 +28,7 @@
 # CENTRAL CHANGE:
 #
 # 1. Edit the pylintrc file in the edx-lint repo at
-#    https://github.com/edx/edx-lint/blob/master/edx_lint/files/pylintrc
+#    https://github.com/openedx/edx-lint/blob/master/edx_lint/files/pylintrc
 #
 # 2. install the updated version of edx-lint (in edx-lint):
 #
@@ -36,19 +36,16 @@
 #
 # 3. Run (in edx-lint):
 #
-#       # uses pylintrc_tweaks from edx-lint for linting in edx-lint
-#       # NOTE: Use Python 3.x, which no longer includes comments in the output file
 #       $ edx_lint write pylintrc
 #
 # 4. Make a new version of edx_lint, submit and review a pull request with the
-#    pylintrc update, and after merging, update the edx-lint version by
-#    creating a new tag in the repo (uses pbr).
+#    pylintrc update, and after merging, update the edx-lint version and
+#    publish the new version.
 #
 # 5. In your local repo, install the newer version of edx-lint.
 #
 # 6. Run:
 #
-#       # uses local pylintrc_tweaks
 #       $ edx_lint write pylintrc
 #
 # 7. This will modify the local file.  Submit a pull request to get it
@@ -67,7 +64,7 @@
 # SERIOUSLY.
 #
 # ------------------------------
-# Generated by edx-lint version: 5.1.0
+# Generated by edx-lint version: 5.3.6
 # ------------------------------
 [MASTER]
 ignore = migrations
@@ -105,20 +102,12 @@ enable =
 	cell-var-from-loop,
 	confusing-with-statement,
 	continue-in-finally,
-	cyclical-import,
 	dangerous-default-value,
-	dict-items-not-iterating,
-	dict-keys-not-iterating,
-	dict-values-not-iterating,
 	duplicate-argument-name,
 	duplicate-bases,
 	duplicate-except,
 	duplicate-key,
-	eq-without-hash,
-	exception-escape,
-	exception-message-attribute,
 	expression-not-assigned,
-	filter-builtin-not-iterating,
 	format-combined-specification,
 	format-needs-mapping,
 	function-redefined,
@@ -126,33 +115,26 @@ enable =
 	import-error,
 	import-self,
 	inconsistent-mro,
-	indexing-exception,
 	inherit-non-class,
 	init-is-generator,
 	invalid-all-object,
-	invalid-encoded-data,
 	invalid-format-index,
 	invalid-length-returned,
 	invalid-sequence-index,
 	invalid-slice-index,
 	invalid-slots-object,
 	invalid-slots,
-	invalid-str-codec,
 	invalid-unary-operand-type,
 	logging-too-few-args,
 	logging-too-many-args,
 	logging-unsupported-format,
 	lost-exception,
-	map-builtin-not-iterating,
 	method-hidden,
 	misplaced-bare-raise,
 	misplaced-future,
 	missing-format-argument-key,
 	missing-format-attribute,
 	missing-format-string-key,
-	missing-super-argument,
-	mixed-fomat-string,
-	model-unicode-not-callable,
 	no-member,
 	no-method-argument,
 	no-name-in-module,
@@ -161,8 +143,6 @@ enable =
 	non-iterator-returned,
 	non-parent-method-called,
 	nonexistent-operator,
-	nonimplemented-raised,
-	nonstandard-exception,
 	not-a-mapping,
 	not-an-iterable,
 	not-callable,
@@ -170,35 +150,25 @@ enable =
 	not-in-loop,
 	pointless-statement,
 	pointless-string-statement,
-	property-on-old-class,
 	raising-bad-type,
 	raising-non-exception,
-	raising-string,
-	range-builtin-not-iterating,
 	redefined-builtin,
-	redefined-in-handler,
 	redefined-outer-name,
-	redefined-variable-type,
 	redundant-keyword-arg,
-	relative-import,
 	repeated-keyword,
 	return-arg-in-generator,
 	return-in-init,
 	return-outside-function,
 	signature-differs,
-	slots-on-old-class,
 	super-init-not-called,
 	super-method-not-called,
-	super-on-old-class,
 	syntax-error,
-	sys-max-int,
 	test-inherits-tests,
 	too-few-format-args,
 	too-many-format-args,
 	too-many-function-args,
 	translation-of-non-string,
 	truncated-format-string,
-	unbalance-tuple-unpacking,
 	undefined-all-variable,
 	undefined-loop-variable,
 	undefined-variable,
@@ -214,11 +184,8 @@ enable =
 	used-before-assignment,
 	using-constant-test,
 	yield-outside-function,
-	zip-builtin-not-iterating,
 	
 	astroid-error,
-	django-not-available-placeholder,
-	django-not-available,
 	fatal,
 	method-check-failed,
 	parse-error,
@@ -240,7 +207,6 @@ enable =
 	bad-classmethod-argument,
 	bad-mcs-classmethod-argument,
 	bad-mcs-method-argument,
-	bad-whitespace,
 	bare-except,
 	broad-except,
 	consider-iterating-dictionary,
@@ -250,16 +216,10 @@ enable =
 	literal-used-as-attribute,
 	logging-format-interpolation,
 	logging-not-lazy,
-	metaclass-assignment,
-	model-has-unicode,
-	model-missing-unicode,
-	model-no-explicit-unicode,
 	multiple-imports,
 	multiple-statements,
 	no-classmethod-decorator,
 	no-staticmethod-decorator,
-	old-raise-syntax,
-	old-style-class,
 	protected-access,
 	redundant-unittest-assert,
 	reimported,
@@ -287,7 +247,6 @@ enable =
 	wrong-import-position,
 	
 	missing-final-newline,
-	mixed-indentation,
 	mixed-line-endings,
 	trailing-newlines,
 	trailing-whitespace,
@@ -298,38 +257,17 @@ enable =
 	deprecated-pragma,
 	unrecognized-inline-option,
 	useless-suppression,
-	
-	cmp-method,
-	coerce-method,
-	delslice-method,
-	dict-iter-method,
-	dict-view-method,
-	div-method,
-	getslice-method,
-	hex-method,
-	idiv-method,
-	next-method-called,
-	next-method-defined,
-	nonzero-method,
-	oct-method,
-	rdiv-method,
-	setslice-method,
-	using-cmp-argument,
 disable = 
-	bad-continuation,
 	bad-indentation,
+	broad-exception-raised,
+	consider-using-f-string,
 	duplicate-code,
 	file-ignored,
 	fixme,
 	global-statement,
 	invalid-name,
 	locally-disabled,
-	locally-enabled,
-	lowercase-l-suffix,
-	misplaced-comparison-constant,
 	no-else-return,
-	no-init,
-	no-self-use,
 	suppressed-message,
 	too-few-public-methods,
 	too-many-ancestors,
@@ -348,54 +286,14 @@ disable =
 	feature-toggle-needs-doc,
 	illegal-waffle-usage,
 	
-	apply-builtin,
-	backtick,
-	bad-python3-import,
-	basestring-builtin,
-	buffer-builtin,
-	cmp-builtin,
-	coerce-builtin,
-	deprecated-itertools-function,
-	deprecated-operator-function,
-	deprecated-str-translate-call,
-	deprecated-string-function,
-	deprecated-sys-function,
-	deprecated-types-field,
-	deprecated-urllib-function,
-	execfile-builtin,
-	file-builtin,
-	import-star-module-level,
-	input-builtin,
-	intern-builtin,
-	long-builtin,
-	long-suffix,
-	no-absolute-import,
-	non-ascii-bytes-literal,
-	old-division,
-	old-ne-operator,
-	old-octal-literal,
-	parameter-unpacking,
-	print-statement,
-	raw_input-builtin,
-	reduce-builtin,
-	reload-builtin,
-	round-builtin,
-	standarderror-builtin,
-	unichr-builtin,
-	unicode-builtin,
-	unpacking-in-except,
-	xrange-builtin,
-	
 	logging-fstring-interpolation,,invalid-name,django-not-configured,consider-using-f-string
 
 [REPORTS]
 output-format = text
-files-output = no
 reports = no
 score = no
 
 [BASIC]
-bad-functions = map,filter,apply,input
 module-rgx = (([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
 const-rgx = (([A-Z_][A-Z0-9_]*)|(__.*__)|log|urlpatterns)$
 class-rgx = [A-Z_][a-zA-Z0-9]+$
@@ -415,7 +313,6 @@ docstring-min-length = 5
 max-line-length = 120
 ignore-long-lines = ^\s*(# )?((<?https?://\S+>?)|(\.\. \w+: .*))$
 single-line-if-stmt = no
-no-space-check = trailing-comma,dict-separator
 max-module-lines = 1000
 indent-string = '    '
 
@@ -484,6 +381,6 @@ ext-import-graph =
 int-import-graph = 
 
 [EXCEPTIONS]
-overgeneral-exceptions = Exception
+overgeneral-exceptions = builtins.Exception
 
-# cf8aeffe707c560bc5da35619dcdc8e921485395
+# c77def02799552cb175445a72366810676643bb6